Commit 1d567e19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking updates from David Miller:

 1) tx_filtered/ps_tx_buf queues need to be accessed with the SKB queue
    lock, from Arik Nemtsov.

 2) Don't call 802.11 driver's filter configure method until it's
    actually open, from Felix Fietkau.

 3) Use ieee80211_free_txskb otherwise we leak control information.
    From Johannes Berg.

 4) Fix memory leak in bluetooth UUID removal,f rom Johan Hedberg.

 5) The shift mask trick doesn't work properly when 'optname' is out of
    range in do_ip_setsockopt().  Use a straightforward switch statement
    instead, the compiler emits essentially the same code but without
    the missing range check.  From Xi Wang.

 6) Fix when we call tcp_replace_ts_recent() otherwise we can
    erroneously accept a too-high tsval.  From Eric Dumazet.

 7) VXLAN bug fixes, mostly to do with VLAN header length handling, from
    Alexander Duyck.

 8) Missing return value initialization for IPV6_MINHOPCOUNT socket
    option handling.  From Hannes Frederic.

 9) Fix regression in tasklet handling in jme/ksz884x/xilinx drivers,
    from Xiaotian Feng.

10) At smsc911x driver init time, we don't know if the chip is in word
    swap mode or not.  However we do need to wait for the control
    register's ready bit to be set before we program any other part of
    the chip.  Adjust the wait loop to account for this.  From Kamlakant
    Patel.

11) Revert erroneous MDIO bus unregister change to mdio-bitbang.c

12) Fix memory leak in /proc/net/sctp/, from Tommi Rantala.

13) tilegx driver registers IRQ with NULL name, oops, from Simon Marchi.

14) TCP metrics hash table kzalloc() based allocation can fail, back
    down to using vmalloc() if it does.  From Eric Dumazet.

15) Fix packet steering out-of-order delivery regression, from Tom
    Herbert.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)
  net-rps: Fix brokeness causing OOO packets
  tcp: handle tcp_net_metrics_init() order-5 memory allocation failures
  batman-adv: process broadcast packets in BLA earlier
  batman-adv: don't add TEMP clients belonging to other backbone nodes
  batman-adv: correctly pass the client flag on tt_response
  batman-adv: fix tt_global_entries flags update
  tilegx: request_irq with a non-null device name
  net: correct check in dev_addr_del()
  tcp: fix retransmission in repair mode
  sctp: fix /proc/net/sctp/ memory leak
  Revert "drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free"
  net/smsc911x: Fix ready check in cases where WORD_SWAP is needed
  drivers/net: fix tasklet misuse issue
  ipv4/ip_vti.c: VTI fix post-decryption forwarding
  brcmfmac: fix typo in CONFIG_BRCMISCAN
  vxlan: Update hard_header_len based on lowerdev when instantiating VXLAN
  vxlan: fix a typo.
  ipv6: setsockopt(IPIPPROTO_IPV6, IPV6_MINHOPCOUNT) forgot to set return value
  doc/net: Fix typo in netdev-features.txt
  vxlan: Fix error that was resulting in VXLAN MTU size being 10 bytes too large
  ...
parents d3fb6955 a8203d3c

Documentation/networking/netdev-features.txt

+1 −1
Original line number Diff line number Diff line
@@ -164,4 +164,4 @@ read the CRC recorded by the NIC on receipt of the packet. 
This requests that the NIC receive all possible frames, including errored

frames (such as bad FCS, etc).  This can be helpful when sniffing a link with

bad packets on it.  Some NICs may receive more packets if also put into normal

PROMISC mdoe.
 
PROMISC mode.

drivers/bluetooth/ath3k.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3304) },

	{ USB_DEVICE(0x0930, 0x0215) },

	{ USB_DEVICE(0x0489, 0xE03D) },

	{ USB_DEVICE(0x0489, 0xE027) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },

drivers/net/ethernet/jme.c

+8 −20
Original line number Diff line number Diff line
@@ -1860,10 +1860,14 @@ jme_open(struct net_device *netdev) 
	jme_clear_pm(jme);

	JME_NAPI_ENABLE(jme);



	tasklet_enable(&jme->linkch_task);

	tasklet_enable(&jme->txclean_task);

	tasklet_hi_enable(&jme->rxclean_task);

	tasklet_hi_enable(&jme->rxempty_task);

	tasklet_init(&jme->linkch_task, jme_link_change_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->txclean_task, jme_tx_clean_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->rxclean_task, jme_rx_clean_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->rxempty_task, jme_rx_empty_tasklet,

		     (unsigned long) jme);



	rc = jme_request_irq(jme);

	if (rc)
@@ -3079,22 +3083,6 @@ jme_init_one(struct pci_dev *pdev, 
	tasklet_init(&jme->pcc_task,

		     jme_pcc_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->linkch_task,

		     jme_link_change_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->txclean_task,

		     jme_tx_clean_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->rxclean_task,

		     jme_rx_clean_tasklet,

		     (unsigned long) jme);

	tasklet_init(&jme->rxempty_task,

		     jme_rx_empty_tasklet,

		     (unsigned long) jme);

	tasklet_disable_nosync(&jme->linkch_task);

	tasklet_disable_nosync(&jme->txclean_task);

	tasklet_disable_nosync(&jme->rxclean_task);

	tasklet_disable_nosync(&jme->rxempty_task);

	jme->dpi.cur = PCC_P1;



	jme->reg_ghc = 0;

drivers/net/ethernet/micrel/ksz884x.c

+4 −12
Original line number Diff line number Diff line
@@ -5459,8 +5459,10 @@ static int prepare_hardware(struct net_device *dev) 
	rc = request_irq(dev->irq, netdev_intr, IRQF_SHARED, dev->name, dev);

	if (rc)

		return rc;

	tasklet_enable(&hw_priv->rx_tasklet);

	tasklet_enable(&hw_priv->tx_tasklet);

	tasklet_init(&hw_priv->rx_tasklet, rx_proc_task,

		     (unsigned long) hw_priv);

	tasklet_init(&hw_priv->tx_tasklet, tx_proc_task,

		     (unsigned long) hw_priv);



	hw->promiscuous = 0;

	hw->all_multi = 0;
@@ -7033,16 +7035,6 @@ static int __devinit pcidev_init(struct pci_dev *pdev, 
	spin_lock_init(&hw_priv->hwlock);

	mutex_init(&hw_priv->lock);



	/* tasklet is enabled. */

	tasklet_init(&hw_priv->rx_tasklet, rx_proc_task,

		(unsigned long) hw_priv);

	tasklet_init(&hw_priv->tx_tasklet, tx_proc_task,

		(unsigned long) hw_priv);



	/* tasklet_enable will decrement the atomic counter. */

	tasklet_disable(&hw_priv->rx_tasklet);

	tasklet_disable(&hw_priv->tx_tasklet);



	for (i = 0; i < TOTAL_PORT_NUM; i++)

		init_waitqueue_head(&hw_priv->counter[i].counter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE