Commit 6456a043 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:
 "This fixes the most immediate fallout from yesterday's networking
  merge:

   1) sock_tx_timestamp() must not clear the passed in tx_flags, but
      rather add to them.  Fix from Eric Dumazet.

   2) The hyperv driver sendbuf region increase needs to be decreased
      slightly to handle older backends.  From KY Srinivasan.

   3) Fix RCU lockdep splats in netlink diag after recent hashing
      changes, from Thomas Graf.

   4) The new IPV6_FLOWLABEL was given a socket option number that
      overlapped with an existing IP6 tables one, breaking ip6_tables.
      Fixed by Pablo Neira Ayuso"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  netlink: hold nl_sock_hash_lock during diag dump
  tcp: md5: check md5 signature without socket lock
  net: fix USB network driver config option.
  net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
  vmxnet3: fix decimal printf format specifiers prefixed with 0x
  net-timestamp: cumulative tcp timestamping fixes
  hyperv: Adjust the size of sendbuf region to support ws2008r2
  cxgb4: Fix for SR-IOV VF initialization
  net-timestamp: sock_tx_timestamp() fix
parents 158c1294 6c8f7e70

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -6527,11 +6527,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 




	/* We control everything through one PF */

	/* We control everything through one PF */

	func = SOURCEPF_GET(readl(adapter->regs + PL_WHOAMI));

	func = SOURCEPF_GET(readl(adapter->regs + PL_WHOAMI));

	if ((pdev->device == 0xa000 && func != 0) ||

	if (func != ent->driver_data) {

	    func != ent->driver_data) {

		pci_save_state(pdev);        /* to restore SR-IOV later */

		pci_save_state(pdev);        /* to restore SR-IOV later */

		err = 0;

		goto sriov;

		goto out_unmap_bar0;

	}

	}





	adapter->pdev = pdev;

	adapter->pdev = pdev;
@@ -6697,6 +6695,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (is_offload(adapter))

	if (is_offload(adapter))

		attach_ulds(adapter);

		attach_ulds(adapter);





sriov:

#ifdef CONFIG_PCI_IOV

#ifdef CONFIG_PCI_IOV

	if (func < ARRAY_SIZE(num_vf) && num_vf[func] > 0)

	if (func < ARRAY_SIZE(num_vf) && num_vf[func] > 0)

		if (pci_enable_sriov(pdev, num_vf[func]) == 0)

		if (pci_enable_sriov(pdev, num_vf[func]) == 0)

drivers/net/hyperv/hyperv_net.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -585,7 +585,7 @@ struct nvsp_message { 




#define NETVSC_RECEIVE_BUFFER_SIZE		(1024*1024*16)	/* 16MB */

#define NETVSC_RECEIVE_BUFFER_SIZE		(1024*1024*16)	/* 16MB */

#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY	(1024*1024*15)  /* 15MB */

#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY	(1024*1024*15)  /* 15MB */

#define NETVSC_SEND_BUFFER_SIZE			(1024 * 1024 * 16)   /* 16MB */

#define NETVSC_SEND_BUFFER_SIZE			(1024 * 1024 * 15)   /* 15MB */

#define NETVSC_INVALID_INDEX			-1

#define NETVSC_INVALID_INDEX			-1

drivers/net/usb/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ comment "Host-side USB support is needed for USB Network Adapter support" 
	depends on !USB && NET

	depends on !USB && NET





menuconfig USB_NET_DRIVERS

menuconfig USB_NET_DRIVERS

	bool "USB Network Adapters"

	tristate "USB Network Adapters"

	default y

	default USB if USB

	depends on USB && NET

	depends on USB && NET





if USB_NET_DRIVERS

if USB_NET_DRIVERS

drivers/net/vmxnet3/vmxnet3_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -766,7 +766,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx, 
			gdesc->dword[3] = 0;

			gdesc->dword[3] = 0;





			netdev_dbg(adapter->netdev,

			netdev_dbg(adapter->netdev,

				"txd[%u]: 0x%llu %u %u\n",

				"txd[%u]: 0x%llx %u %u\n",

				tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr),

				tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr),

				le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);

				le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);

			vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);

			vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);

drivers/net/wireless/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ config USB_NET_RNDIS_WLAN 
	tristate "Wireless RNDIS USB support"

	tristate "Wireless RNDIS USB support"

	depends on USB

	depends on USB

	depends on CFG80211

	depends on CFG80211

	select USB_NET_DRIVERS

	select USB_USBNET

	select USB_USBNET

	select USB_NET_CDCETHER

	select USB_NET_CDCETHER

	select USB_NET_RNDIS_HOST

	select USB_NET_RNDIS_HOST

CRA Git | Maintained and supported by SUSTech CRA and CCSE