5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 4247356c16ff..1a162d21d8ac 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -6527,11 +6527,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* We control everything through one PF */
         func = SOURCEPF_GET(readl(adapter->regs + PL_WHOAMI));
-        if ((pdev->device == 0xa000 && func != 0) ||
-            func != ent->driver_data) {
+        if (func != ent->driver_data) {
                 pci_save_state(pdev);        /* to restore SR-IOV later */
-                err = 0;
-                goto out_unmap_bar0;
+                goto sriov;
         }
 
         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))
                 attach_ulds(adapter);
 
+sriov:
 #ifdef CONFIG_PCI_IOV
         if (func < ARRAY_SIZE(num_vf) && num_vf[func] > 0)
                 if (pci_enable_sriov(pdev, num_vf[func]) == 0)
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 02a3ee282eee..d5e07def6a59 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -585,7 +585,7 @@ struct nvsp_message {
 
 #define NETVSC_RECEIVE_BUFFER_SIZE              (1024*1024*16)  /* 16MB */
 #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
 
 
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 9f194a0bef7c..37eed4d84e9c 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -5,8 +5,8 @@ comment "Host-side USB support is needed for USB Network Adapter support"
         depends on !USB && NET
 
 menuconfig USB_NET_DRIVERS
-        bool "USB Network Adapters"
-        default y
+        tristate "USB Network Adapters"
+        default USB if USB
         depends on USB && NET
 
 if USB_NET_DRIVERS
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index b76f7dcde0db..d0db371c30a7 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -766,7 +766,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
                         gdesc->dword[3] = 0;
 
                         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),
                                 le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);
                         vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index b2137e8f7ca6..16604bdf5197 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -189,6 +189,7 @@ config USB_NET_RNDIS_WLAN
         tristate "Wireless RNDIS USB support"
         depends on USB
         depends on CFG80211
+        select USB_NET_DRIVERS
         select USB_USBNET
         select USB_NET_CDCETHER
         select USB_NET_RNDIS_HOST