Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50dddff3 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:

 1) Don't halt the firmware in r8152 driver, from Hayes Wang.

 2) Handle full sized 802.1ad frames in bnx2 and tg3 drivers properly,
    from Vlad Yasevich.

 3) Don't sleep while holding tx_clean_lock in netxen driver, fix from
    Manish Chopra.

 4) Certain kinds of ipv6 routes can end up endlessly failing the route
    validation test, causing it to be re-looked up over and over again.
    This particularly kills input route caching in TCP sockets.  Fix
    from Hannes Frederic Sowa.

 5) netvsc_start_xmit() has a use-after-free access to skb->len, fix
    from K Y Srinivasan.

 6) Fix matching of inverted containers in ematch module, from Ignacy
    Gawędzki.

 7) Aggregation of GRO frames via SKB ->frag_list for linear skbs isn't
    handled properly, regression fix from Eric Dumazet.

 8) Don't test return value of ipv4_neigh_lookup(), which returns an
    error pointer, against NULL.  From WANG Cong.

 9) Fix an old regression where we mistakenly allow a double add of the
    same tunnel.  Fixes from Steffen Klassert.

10) macvtap device delete and open can run in parallel and corrupt lists
    etc., fix from Vlad Yasevich.

11) Fix build error with IPV6=m NETFILTER_XT_TARGET_TPROXY=y, from Pablo
    Neira Ayuso.

12) rhashtable_destroy() triggers lockdep splats, fix also from Pablo.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits)
  bna: Update Maintainer Email
  r8152: disable power cut for RTL8153
  r8152: remove clearing bp
  bnx2: Correctly receive full sized 802.1ad fragmes
  tg3: Allow for recieve of full-size 8021AD frames
  r8152: fix setting RTL8152_UNPLUG
  netxen: Fix bug in Tx completion path.
  netxen: Fix BUG "sleeping function called from invalid context"
  ipv6: remove rt6i_genid
  hyperv: Fix a bug in netvsc_start_xmit()
  net: stmmac: fix stmmac_pci_probe failed when CONFIG_HAVE_CLK is selected
  ematch: Fix matching of inverted containers.
  gro: fix aggregation for skb using frag_list
  neigh: check error pointer instead of NULL for ipv4_neigh_lookup()
  ip6_gre: Return an error when adding an existing tunnel.
  ip6_vti: Return an error when adding an existing tunnel.
  ip6_tunnel: Return an error when adding an existing tunnel.
  ip6gre: add a rtnl link alias for ip6gretap
  net/mlx4_core: Allow not to specify probe_vf in SRIOV IB mode
  r8152: fix the carrier off when autoresuming
  ...
parents a44f8672 439e9575

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2098,7 +2098,7 @@ S: Supported 
F:	drivers/scsi/bfa/



BROCADE BNA 10 GIGABIT ETHERNET DRIVER

M:	Rasesh Mody <rmody@brocade.com>

M:	Rasesh Mody <rasesh.mody@qlogic.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/brocade/bna/

drivers/net/ethernet/broadcom/bnx2.c

+3 −2
Original line number Diff line number Diff line
@@ -3236,8 +3236,9 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) 


		skb->protocol = eth_type_trans(skb, bp->dev);



		if ((len > (bp->dev->mtu + ETH_HLEN)) &&

			(ntohs(skb->protocol) != 0x8100)) {

		if (len > (bp->dev->mtu + ETH_HLEN) &&

		    skb->protocol != htons(0x8100) &&

		    skb->protocol != htons(ETH_P_8021AD)) {



			dev_kfree_skb(skb);

			goto next_rx;

drivers/net/ethernet/broadcom/tg3.c

+2 −1
Original line number Diff line number Diff line
@@ -6918,7 +6918,8 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) 
		skb->protocol = eth_type_trans(skb, tp->dev);



		if (len > (tp->dev->mtu + ETH_HLEN) &&

		    skb->protocol != htons(ETH_P_8021Q)) {

		    skb->protocol != htons(ETH_P_8021Q) &&

		    skb->protocol != htons(ETH_P_8021AD)) {

			dev_kfree_skb_any(skb);

			goto drop_it_no_recycle;

		}

drivers/net/ethernet/cadence/macb.c

+0 −11
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/of_device.h>

#include <linux/of_mdio.h>

#include <linux/of_net.h>

#include <linux/pinctrl/consumer.h>



#include "macb.h"
@@ -2071,7 +2070,6 @@ static int __init macb_probe(struct platform_device *pdev) 
	struct phy_device *phydev;

	u32 config;

	int err = -ENXIO;

	struct pinctrl *pinctrl;

	const char *mac;



	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2080,15 +2078,6 @@ static int __init macb_probe(struct platform_device *pdev) 
		goto err_out;

	}



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		err = PTR_ERR(pinctrl);

		if (err == -EPROBE_DEFER)

			goto err_out;



		dev_warn(&pdev->dev, "No pinctrl provided\n");

	}



	err = -ENOMEM;

	dev = alloc_etherdev(sizeof(*bp));

	if (!dev)

drivers/net/ethernet/mellanox/mlx4/main.c

+2 −2
Original line number Diff line number Diff line
@@ -78,13 +78,13 @@ MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero"); 
#endif /* CONFIG_PCI_MSI */



static uint8_t num_vfs[3] = {0, 0, 0};

static int num_vfs_argc = 3;

static int num_vfs_argc;

module_param_array(num_vfs, byte , &num_vfs_argc, 0444);

MODULE_PARM_DESC(num_vfs, "enable #num_vfs functions if num_vfs > 0\n"

			  "num_vfs=port1,port2,port1+2");



static uint8_t probe_vf[3] = {0, 0, 0};

static int probe_vfs_argc = 3;

static int probe_vfs_argc;

module_param_array(probe_vf, byte, &probe_vfs_argc, 0444);

MODULE_PARM_DESC(probe_vf, "number of vfs to probe by pf driver (num_vfs > 0)\n"

			   "probe_vf=port1,port2,port1+2");