Commit 06693f30 authored Jul 31, 2013 by Linus Torvalds

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

Pull networking fixes from David Miller:

 1) Fix association failures not triggering a connect-failure event in
    cfg80211, from Johannes Berg.

 2) Eliminate a potential NULL deref with older iptables tools when
    configuring xt_socket rules, from Eric Dumazet.

 3) Missing RTNL locking in wireless regulatory code, from Johannes
    Berg.

 4) Fix OOPS caused by firmware loading races in ath9k_htc, from Alexey
    Khoroshilov.

 5) Fix usb URB leak in usb_8dev CAN driver, also from Alexey
    Khoroshilov.

 6) VXLAN namespace teardown fails to unregister devices, from Stephen
    Hemminger.

 7) Fix multicast settings getting dropped by firmware in qlcnic driver,
    from Sucheta Chakraborty.

 8) Add sysctl range enforcement for tcp_syn_retries, from Michal Tesar.

 9) Fix a nasty bug in bridging where an active timer would get
    reinitialized with a setup_timer() call.  From Eric Dumazet.

10) Fix use after free in new mlx5 driver, from Dan Carpenter.

11) Fix freed pointer reference in ipv6 multicast routing on namespace
    cleanup, from Hannes Frederic Sowa.

12) Some usbnet drivers report TSO and SG in their feature set, but the
    usbnet layer doesn't really support them.  From Eric Dumazet.

13) Fix crash on EEH errors in tg3 driver, from Gavin Shan.

14) Drop cb_lock when requesting modules in genetlink, from Stanislaw
    Gruszka.

15) Kernel stack leaks in cbq scheduler and af_key pfkey messages, from
    Dan Carpenter.

16) FEC driver erroneously signals NETDEV_TX_BUSY on transmit leading to
    endless loops, from Uwe Kleine-König.

17) Fix hangs from loading mvneta driver, from Arnaud Patard.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (84 commits)
  mlx5: fix error return code in mlx5_alloc_uuars()
  mvneta: Try to fix mvneta when compiled as module
  mvneta: Fix hang when loading the mvneta driver
  atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring
  genetlink: fix usage of NLM_F_EXCL or NLM_F_REPLACE
  af_key: more info leaks in pfkey messages
  net/fec: Don't let ndo_start_xmit return NETDEV_TX_BUSY without link
  net_sched: Fix stack info leak in cbq_dump_wrr().
  igb: fix vlan filtering in promisc mode when not in VT mode
  ixgbe: Fix Tx Hang issue with lldpad on 82598EB
  genetlink: release cb_lock before requesting additional module
  net: fec: workaround stop tx during errata ERR006358
  qlcnic: Fix diagnostic interrupt test for 83xx adapters.
  qlcnic: Fix setting Guest VLAN
  qlcnic: Fix operation type and command type.
  qlcnic: Fix initialization of work function.
  Revert "atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring"
  atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring
  net/tg3: Fix warning from pci_disable_device()
  net/tg3: Fix kernel crash
  ...

parents 75eaff01 a661b43f

drivers/net/arcnet/arcnet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1007,7 +1007,7 @@ static void arcnet_rx(struct net_device *dev, int bufnum)

		soft = &pkt.soft.rfc1201;

		lp->hw.copy_from_card(dev, bufnum, 0, &pkt, sizeof(ARC_HDR_SIZE));
		lp->hw.copy_from_card(dev, bufnum, 0, &pkt, ARC_HDR_SIZE);
		if (pkt.hard.offset[0]) {
		ofs = pkt.hard.offset[0];
		length = 256 - ofs;

drivers/net/can/usb/esd_usb2.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -412,10 +412,20 @@ static void esd_usb2_read_bulk_callback(struct urb *urb)

		switch (msg->msg.hdr.cmd) {
		case CMD_CAN_RX:
		if (msg->msg.rx.net >= dev->net_count) {
		dev_err(dev->udev->dev.parent, "format error\n");
		break;
		}

		esd_usb2_rx_can_msg(dev->nets[msg->msg.rx.net], msg);
		break;

		case CMD_CAN_TX:
		if (msg->msg.txdone.net >= dev->net_count) {
		dev_err(dev->udev->dev.parent, "format error\n");
		break;
		}

		esd_usb2_tx_done_msg(dev->nets[msg->msg.txdone.net],
		msg);
		break;

drivers/net/can/usb/usb_8dev.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -779,6 +779,7 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)
		usb_unanchor_urb(urb);
		usb_free_coherent(priv->udev, RX_BUFFER_SIZE, buf,
		urb->transfer_dma);
		usb_free_urb(urb);
		break;
		}

drivers/net/ethernet/allwinner/Kconfig

+14 −12

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		config NET_VENDOR_ALLWINNER
		bool "Allwinner devices"
		default y

		depends on ARCH_SUNXI
		---help---
		If you have a network (Ethernet) card belonging to this
		@@ -26,6 +27,7 @@ config SUN4I_EMAC
		select CRC32
		select MII
		select PHYLIB
		select MDIO_SUN4I
		---help---
		Support for Allwinner A10 EMAC ethernet driver.

drivers/net/ethernet/atheros/atl1c/atl1c.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -520,6 +520,9 @@ struct atl1c_adapter {
		struct net_device *netdev;
		struct pci_dev *pdev;
		struct napi_struct napi;
		struct page *rx_page;
		unsigned int rx_page_offset;
		unsigned int rx_frag_size;
		struct atl1c_hw hw;
		struct atl1c_hw_stats hw_stats;
		struct mii_if_info mii; /* MII interface info */