Commit eb3d3390 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:
 "It's been a while since my last pull request so quite a few fixes have
  piled up."

Indeed.

 1) Fix nf_{log,queue} compilation with PROC_FS disabled, from Pablo
    Neira Ayuso.

 2) Fix data corruption on some tg3 chips with TSO enabled, from Michael
    Chan.

 3) Fix double insertion of VLAN tags in be2net driver, from Sarveshwar
    Bandi.

 4) Don't have TCP's MD5 support pass > PAGE_SIZE page offsets in
    scatter-gather entries into the crypto layer, the crypto layer can't
    handle that.  From Eric Dumazet.

 5) Fix lockdep splat in 802.1Q MRP code, also from Eric Dumazet.

 6) Fix OOPS in netfilter log module when called from conntrack, from
    Hans Schillstrom.

 7) FEC driver needs to use netif_tx_{lock,unlock}_bh() rather than the
    non-BH disabling variants.  From Fabio Estevam.

 8) TCP GSO can generate out-of-order packets, fix from Eric Dumazet.

 9) vxlan driver doesn't update 'used' field of fdb entries when it
    should, from Sridhar Samudrala.

10) ipv6 should use kzalloc() to allocate inet6 socket cork options,
    otherwise we can OOPS in ip6_cork_release().  From Eric Dumazet.

11) Fix races in bonding set mode, from Nikolay Aleksandrov.

12) Fix checksum generation regression added by "r8169: fix 8168evl
    frame padding.", from Francois Romieu.

13) ip_gre can look at stale SKB data pointer, fix from Eric Dumazet.

14) Fix checksum handling when GSO is enabled in bnx2x driver with
    certain chips, from Yuval Mintz.

15) Fix double free in batman-adv, from Martin Hundebøll.

16) Fix device startup synchronization with firmware in tg3 driver, from
    Nithin Sujit.

17) perf networking dropmonitor doesn't work at all due to mixed up
    trace parameter ordering, from Ben Hutchings.

18) Fix proportional rate reduction handling in tcp_ack(), from Nandita
    Dukkipati.

19) IPSEC layer doesn't return an error when a valid state is detected,
    causing an OOPS.  Fix from Timo Teräs.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (85 commits)
  be2net: bug fix on returning an invalid nic descriptor
  tcp: xps: fix reordering issues
  net: Revert unused variable changes.
  xfrm: properly handle invalid states as an error
  virtio_net: enable napi for all possible queues during open
  tcp: bug fix in proportional rate reduction.
  net: ethernet: sun: drop unused variable
  net: ethernet: korina: drop unused variable
  net: ethernet: apple: drop unused variable
  qmi_wwan: Added support for Cinterion's PLxx WWAN Interface
  perf: net_dropmonitor: Remove progress indicator
  perf: net_dropmonitor: Use bisection in symbol lookup
  perf: net_dropmonitor: Do not assume ordering of dictionaries
  perf: net_dropmonitor: Fix symbol-relative addresses
  perf: net_dropmonitor: Fix trace parameter order
  net: fec: use a more proper compatible string for MVF type device
  qlcnic: Fix updating netdev->features
  qlcnic: remove netdev->trans_start updates within the driver
  qlcnic: Return proper error codes from probe failure paths
  tg3: Update version to 3.132
  ...
parents 514e250f 950e2958

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -5524,18 +5524,18 @@ F: Documentation/networking/s2io.txt 
F:	Documentation/networking/vxge.txt

F:	drivers/net/ethernet/neterion/



NETFILTER/IPTABLES/IPCHAINS

P:	Harald Welte

P:	Jozsef Kadlecsik

NETFILTER/IPTABLES

M:	Pablo Neira Ayuso <pablo@netfilter.org>

M:	Patrick McHardy <kaber@trash.net>

M:	Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

L:	netfilter-devel@vger.kernel.org

L:	netfilter@vger.kernel.org

L:	coreteam@netfilter.org

W:	http://www.netfilter.org/

W:	http://www.iptables.org/

T:	git git://1984.lsi.us.es/nf

T:	git git://1984.lsi.us.es/nf-next

Q:	http://patchwork.ozlabs.org/project/netfilter-devel/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

S:	Supported

F:	include/linux/netfilter*

F:	include/linux/netfilter/

drivers/bcma/scan.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = { 
	{ BCMA_CORE_I2S, "I2S" },

	{ BCMA_CORE_SDR_DDR1_MEM_CTL, "SDR/DDR1 Memory Controller" },

	{ BCMA_CORE_SHIM, "SHIM" },

	{ BCMA_CORE_PCIE2, "PCIe Gen2" },

	{ BCMA_CORE_ARM_CR4, "ARM CR4" },

	{ BCMA_CORE_DEFAULT, "Default" },

};

drivers/isdn/capi/kcapi.c

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ capi_ctr_put(struct capi_ctr *ctr) 


static inline struct capi_ctr *get_capi_ctr_by_nr(u16 contr)

{

	if (contr - 1 >= CAPI_MAXCONTR)

	if (contr < 1 || contr - 1 >= CAPI_MAXCONTR)

		return NULL;



	return capi_controller[contr - 1];
@@ -103,7 +103,7 @@ static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid) 
{

	lockdep_assert_held(&capi_controller_lock);



	if (applid - 1 >= CAPI_MAXAPPL)

	if (applid < 1 || applid - 1 >= CAPI_MAXAPPL)

		return NULL;



	return capi_applications[applid - 1];
@@ -111,7 +111,7 @@ static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid) 


static inline struct capi20_appl *get_capi_appl_by_nr(u16 applid)

{

	if (applid - 1 >= CAPI_MAXAPPL)

	if (applid < 1 || applid - 1 >= CAPI_MAXAPPL)

		return NULL;



	return rcu_dereference(capi_applications[applid - 1]);

drivers/net/bonding/bond_3ad.c

+17 −4
Original line number Diff line number Diff line
@@ -2360,14 +2360,15 @@ int bond_3ad_set_carrier(struct bonding *bond) 
}



/**

 * bond_3ad_get_active_agg_info - get information of the active aggregator

 * __bond_3ad_get_active_agg_info - get information of the active aggregator

 * @bond: bonding struct to work on

 * @ad_info: ad_info struct to fill with the bond's info

 *

 * Returns:   0 on success

 *          < 0 on error

 */

int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info)

int __bond_3ad_get_active_agg_info(struct bonding *bond,

				   struct ad_info *ad_info)

{

	struct aggregator *aggregator = NULL;

	struct port *port;
@@ -2391,6 +2392,18 @@ int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info) 
	return -1;

}



/* Wrapper used to hold bond->lock so no slave manipulation can occur */

int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info)

{

	int ret;



	read_lock(&bond->lock);

	ret = __bond_3ad_get_active_agg_info(bond, ad_info);

	read_unlock(&bond->lock);



	return ret;

}



int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)

{

	struct slave *slave, *start_at;
@@ -2402,8 +2415,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) 
	struct ad_info ad_info;

	int res = 1;



	if (bond_3ad_get_active_agg_info(bond, &ad_info)) {

		pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",

	if (__bond_3ad_get_active_agg_info(bond, &ad_info)) {

		pr_debug("%s: Error: __bond_3ad_get_active_agg_info failed\n",

			 dev->name);

		goto out;

	}

drivers/net/bonding/bond_3ad.h

+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ void bond_3ad_adapter_speed_changed(struct slave *slave); 
void bond_3ad_adapter_duplex_changed(struct slave *slave);

void bond_3ad_handle_link_change(struct slave *slave, char link);

int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);

int  __bond_3ad_get_active_agg_info(struct bonding *bond,

				    struct ad_info *ad_info);

int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);

int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,

			 struct slave *slave);

CRA Git | Maintained and supported by SUSTech CRA and CCSE