18 files changed, 221 insertions, 152 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index a8efb18e42fa..0ab83708b6a1 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8627,6 +8627,7 @@ bnx2_remove_one(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int
 bnx2_suspend(struct device *device)
 {
@@ -8665,7 +8666,6 @@ bnx2_resume(struct device *device)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static SIMPLE_DEV_PM_OPS(bnx2_pm_ops, bnx2_suspend, bnx2_resume);
 #define BNX2_PM_OPS (&bnx2_pm_ops)
 
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index 751d5c7b312d..7e49c43b7af3 100644
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -4,7 +4,7 @@
 
 config NET_CADENCE
         bool "Cadence devices"
-        depends on HAS_IOMEM
+        depends on HAS_IOMEM && (ARM || AVR32 || COMPILE_TEST)
         default y
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y.
@@ -22,7 +22,7 @@ if NET_CADENCE
 
 config ARM_AT91_ETHER
         tristate "AT91RM9200 Ethernet support"
-        depends on HAS_DMA
+        depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST)
         select MACB
         ---help---
           If you wish to compile a kernel for the AT91RM9200 and enable
@@ -30,7 +30,7 @@ config ARM_AT91_ETHER
 
 config MACB
         tristate "Cadence MACB/GEM support"
-        depends on HAS_DMA
+        depends on HAS_DMA && (PLATFORM_AT32AP || ARCH_AT91 || ARCH_PICOXCELL || ARCH_ZYNQ || COMPILE_TEST)
         select PHYLIB
         ---help---
           The Cadence MACB ethernet interface is found on many Atmel AT32 and
diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
index 81e8402a74b4..8a96572fdde0 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
@@ -154,7 +154,7 @@ static int write_l2e(struct adapter *adap, struct l2t_entry *e, int sync)
         req->params = htons(L2T_W_PORT(e->lport) | L2T_W_NOREPLY(!sync));
         req->l2t_idx = htons(e->idx);
         req->vlan = htons(e->vlan);
-        if (e->neigh)
+        if (e->neigh && !(e->neigh->dev->flags & IFF_LOOPBACK))
                 memcpy(e->dmac, e->neigh->ha, sizeof(e->dmac));
         memcpy(req->dst_mac, e->dmac, sizeof(req->dst_mac));
 
@@ -394,6 +394,8 @@ struct l2t_entry *cxgb4_l2t_get(struct l2t_data *d, struct neighbour *neigh,
         if (e) {
                 spin_lock(&e->lock);          /* avoid race with t4_l2t_free */
                 e->state = L2T_STATE_RESOLVING;
+                if (neigh->dev->flags & IFF_LOOPBACK)
+                        memcpy(e->dmac, physdev->dev_addr, sizeof(e->dmac));
                 memcpy(e->addr, addr, addr_len);
                 e->ifindex = ifidx;
                 e->hash = hash;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index fb2fe65903c2..bba67681aeaa 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -682,7 +682,7 @@ enum {
         SF_RD_ID        = 0x9f,       /* read ID */
         SF_ERASE_SECTOR = 0xd8,       /* erase sector */
 
-        FW_MAX_SIZE = 512 * 1024,
+        FW_MAX_SIZE = 16 * SF_SEC_SIZE,
 };
 
 /**
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 8ccaa2520dc3..97db5a7179df 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -374,6 +374,7 @@ enum vf_state {
 #define BE_FLAGS_NAPI_ENABLED                   (1 << 9)
 #define BE_FLAGS_QNQ_ASYNC_EVT_RCVD             (1 << 11)
 #define BE_FLAGS_VXLAN_OFFLOADS                 (1 << 12)
+#define BE_FLAGS_SETUP_DONE                     (1 << 13)
 
 #define BE_UC_PMAC_COUNT                        30
 #define BE_VF_UC_PMAC_COUNT                     2
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 3e6df47b6973..a18645407d21 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2033,11 +2033,13 @@ static void be_tx_compl_clean(struct be_adapter *adapter)
         bool dummy_wrb;
         int i, pending_txqs;
 
-        /* Wait for a max of 200ms for all the tx-completions to arrive. */
+        /* Stop polling for compls when HW has been silent for 10ms */
         do {
                 pending_txqs = adapter->num_tx_qs;
 
                 for_all_tx_queues(adapter, txo, i) {
+                        cmpl = 0;
+                        num_wrbs = 0;
                         txq = &txo->q;
                         while ((txcp = be_tx_compl_get(&txo->cq))) {
                                 end_idx =
@@ -2050,14 +2052,13 @@ static void be_tx_compl_clean(struct be_adapter *adapter)
                         if (cmpl) {
                                 be_cq_notify(adapter, txo->cq.id, false, cmpl);
                                 atomic_sub(num_wrbs, &txq->used);
-                                cmpl = 0;
-                                num_wrbs = 0;
+                                timeo = 0;
                         }
                         if (atomic_read(&txq->used) == 0)
                                 pending_txqs--;
                 }
 
-                if (pending_txqs == 0 || ++timeo > 200)
+                if (pending_txqs == 0 || ++timeo > 10 || be_hw_error(adapter))
                         break;
 
                 mdelay(1);
@@ -2725,6 +2726,12 @@ static int be_close(struct net_device *netdev)
         struct be_eq_obj *eqo;
         int i;
 
+        /* This protection is needed as be_close() may be called even when the
+         * adapter is in cleared state (after eeh perm failure)
+         */
+        if (!(adapter->flags & BE_FLAGS_SETUP_DONE))
+                return 0;
+
         be_roce_dev_close(adapter);
 
         if (adapter->flags & BE_FLAGS_NAPI_ENABLED) {
@@ -3055,6 +3062,7 @@ static int be_clear(struct be_adapter *adapter)
         be_clear_queues(adapter);
 
         be_msix_disable(adapter);
+        adapter->flags &= ~BE_FLAGS_SETUP_DONE;
         return 0;
 }
 
@@ -3559,6 +3567,7 @@ static int be_setup(struct be_adapter *adapter)
                 adapter->phy.fc_autoneg = 1;
 
         be_schedule_worker(adapter);
+        adapter->flags |= BE_FLAGS_SETUP_DONE;
         return 0;
 err:
         be_clear(adapter);
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index d04b1c3c9b85..b248bcbdae63 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -89,9 +89,8 @@
 #define      MVNETA_TX_IN_PRGRS                  BIT(1)
 #define      MVNETA_TX_FIFO_EMPTY                BIT(8)
 #define MVNETA_RX_MIN_FRAME_SIZE                 0x247c
-#define MVNETA_SERDES_CFG                        0x24A0
+#define MVNETA_SGMII_SERDES_CFG                  0x24A0
 #define      MVNETA_SGMII_SERDES_PROTO           0x0cc7
-#define      MVNETA_RGMII_SERDES_PROTO           0x0667
 #define MVNETA_TYPE_PRIO                         0x24bc
 #define      MVNETA_FORCE_UNI                    BIT(21)
 #define MVNETA_TXQ_CMD_1                         0x24e4
@@ -712,6 +711,35 @@ static void mvneta_rxq_bm_disable(struct mvneta_port *pp,
         mvreg_write(pp, MVNETA_RXQ_CONFIG_REG(rxq->id), val);
 }
 
+
+
+/* Sets the RGMII Enable bit (RGMIIEn) in port MAC control register */
+static void mvneta_gmac_rgmii_set(struct mvneta_port *pp, int enable)
+{
+        u32  val;
+
+        val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
+
+        if (enable)
+                val |= MVNETA_GMAC2_PORT_RGMII;
+        else
+                val &= ~MVNETA_GMAC2_PORT_RGMII;
+
+        mvreg_write(pp, MVNETA_GMAC_CTRL_2, val);
+}
+
+/* Config SGMII port */
+static void mvneta_port_sgmii_config(struct mvneta_port *pp)
+{
+        u32 val;
+
+        val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
+        val |= MVNETA_GMAC2_PCS_ENABLE;
+        mvreg_write(pp, MVNETA_GMAC_CTRL_2, val);
+
+        mvreg_write(pp, MVNETA_SGMII_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO);
+}
+
 /* Start the Ethernet port RX and TX activity */
 static void mvneta_port_up(struct mvneta_port *pp)
 {
@@ -2729,15 +2757,12 @@ static void mvneta_port_power_up(struct mvneta_port *pp, int phy_mode)
         mvreg_write(pp, MVNETA_UNIT_INTR_CAUSE, 0);
 
         if (phy_mode == PHY_INTERFACE_MODE_SGMII)
-                mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO);
-        else
-                mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_RGMII_SERDES_PROTO);
+                mvneta_port_sgmii_config(pp);
 
-        val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
-
-        val |= MVNETA_GMAC2_PCS_ENABLE | MVNETA_GMAC2_PORT_RGMII;
+        mvneta_gmac_rgmii_set(pp, 1);
 
         /* Cancel Port Reset */
+        val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
         val &= ~MVNETA_GMAC2_PORT_RESET;
         mvreg_write(pp, MVNETA_GMAC_CTRL_2, val);
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index f0ae95f66ceb..cef267e24f9c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2301,13 +2301,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
         /* Allow large DMA segments, up to the firmware limit of 1 GB */
         dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024);
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                err = -ENOMEM;
-                goto err_release_regions;
-        }
-
-        dev       = &priv->dev;
+        dev       = pci_get_drvdata(pdev);
+        priv      = mlx4_priv(dev);
         dev->pdev = pdev;
         INIT_LIST_HEAD(&priv->ctx_list);
         spin_lock_init(&priv->ctx_lock);
@@ -2374,10 +2369,10 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
                         } else {
                                 atomic_inc(&pf_loading);
                                 err = pci_enable_sriov(pdev, total_vfs);
-                                atomic_dec(&pf_loading);
                                 if (err) {
                                         mlx4_err(dev, "Failed to enable SR-IOV, continuing without SR-IOV (err = %d).\n",
                                                  err);
+                                        atomic_dec(&pf_loading);
                                         err = 0;
                                 } else {
                                         mlx4_warn(dev, "Running in master mode\n");
@@ -2535,8 +2530,10 @@ slave_start:
         mlx4_sense_init(dev);
         mlx4_start_sense(dev);
 
-        priv->pci_dev_data = pci_dev_data;
-        pci_set_drvdata(pdev, dev);
+        priv->removed = 0;
+
+        if (mlx4_is_master(dev) && dev->num_vfs)
+                atomic_dec(&pf_loading);
 
         return 0;
 
@@ -2588,6 +2585,9 @@ err_rel_own:
         if (!mlx4_is_slave(dev))
                 mlx4_free_ownership(dev);
 
+        if (mlx4_is_master(dev) && dev->num_vfs)
+                atomic_dec(&pf_loading);
+
         kfree(priv->dev.dev_vfs);
 
 err_free_dev:
@@ -2604,85 +2604,110 @@ err_disable_pdev:
 
 static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+        struct mlx4_priv *priv;
+        struct mlx4_dev *dev;
+
         printk_once(KERN_INFO "%s", mlx4_version);
 
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        dev       = &priv->dev;
+        pci_set_drvdata(pdev, dev);
+        priv->pci_dev_data = id->driver_data;
+
         return __mlx4_init_one(pdev, id->driver_data);
 }
 
-static void mlx4_remove_one(struct pci_dev *pdev)
+static void __mlx4_remove_one(struct pci_dev *pdev)
 {
         struct mlx4_dev  *dev  = pci_get_drvdata(pdev);
         struct mlx4_priv *priv = mlx4_priv(dev);
+        int               pci_dev_data;
         int p;
 
-        if (dev) {
-                /* in SRIOV it is not allowed to unload the pf's
-                 * driver while there are alive vf's */
-                if (mlx4_is_master(dev)) {
-                        if (mlx4_how_many_lives_vf(dev))
-                                printk(KERN_ERR "Removing PF when there are assigned VF's !!!\n");
-                }
-                mlx4_stop_sense(dev);
-                mlx4_unregister_device(dev);
+        if (priv->removed)
+                return;
 
-                for (p = 1; p <= dev->caps.num_ports; p++) {
-                        mlx4_cleanup_port_info(&priv->port[p]);
-                        mlx4_CLOSE_PORT(dev, p);
-                }
+        pci_dev_data = priv->pci_dev_data;
 
-                if (mlx4_is_master(dev))
-                        mlx4_free_resource_tracker(dev,
-                                                   RES_TR_FREE_SLAVES_ONLY);
-
-                mlx4_cleanup_counters_table(dev);
-                mlx4_cleanup_qp_table(dev);
-                mlx4_cleanup_srq_table(dev);
-                mlx4_cleanup_cq_table(dev);
-                mlx4_cmd_use_polling(dev);
-                mlx4_cleanup_eq_table(dev);
-                mlx4_cleanup_mcg_table(dev);
-                mlx4_cleanup_mr_table(dev);
-                mlx4_cleanup_xrcd_table(dev);
-                mlx4_cleanup_pd_table(dev);
+        /* in SRIOV it is not allowed to unload the pf's
+         * driver while there are alive vf's */
+        if (mlx4_is_master(dev) && mlx4_how_many_lives_vf(dev))
+                printk(KERN_ERR "Removing PF when there are assigned VF's !!!\n");
+        mlx4_stop_sense(dev);
+        mlx4_unregister_device(dev);
 
-                if (mlx4_is_master(dev))
-                        mlx4_free_resource_tracker(dev,
-                                                   RES_TR_FREE_STRUCTS_ONLY);
-
-                iounmap(priv->kar);
-                mlx4_uar_free(dev, &priv->driver_uar);
-                mlx4_cleanup_uar_table(dev);
-                if (!mlx4_is_slave(dev))
-                        mlx4_clear_steering(dev);
-                mlx4_free_eq_table(dev);
-                if (mlx4_is_master(dev))
-                        mlx4_multi_func_cleanup(dev);
-                mlx4_close_hca(dev);
-                if (mlx4_is_slave(dev))
-                        mlx4_multi_func_cleanup(dev);
-                mlx4_cmd_cleanup(dev);
-
-                if (dev->flags & MLX4_FLAG_MSI_X)
-                        pci_disable_msix(pdev);
-                if (dev->flags & MLX4_FLAG_SRIOV) {
-                        mlx4_warn(dev, "Disabling SR-IOV\n");
-                        pci_disable_sriov(pdev);
-                }
+        for (p = 1; p <= dev->caps.num_ports; p++) {
+                mlx4_cleanup_port_info(&priv->port[p]);
+                mlx4_CLOSE_PORT(dev, p);
+        }
 
-                if (!mlx4_is_slave(dev))
-                        mlx4_free_ownership(dev);
+        if (mlx4_is_master(dev))
+                mlx4_free_resource_tracker(dev,
+                                           RES_TR_FREE_SLAVES_ONLY);
 
-                kfree(dev->caps.qp0_tunnel);
-                kfree(dev->caps.qp0_proxy);
-                kfree(dev->caps.qp1_tunnel);
-                kfree(dev->caps.qp1_proxy);
-                kfree(dev->dev_vfs);
+        mlx4_cleanup_counters_table(dev);
+        mlx4_cleanup_qp_table(dev);
+        mlx4_cleanup_srq_table(dev);
+        mlx4_cleanup_cq_table(dev);
+        mlx4_cmd_use_polling(dev);
+        mlx4_cleanup_eq_table(dev);
+        mlx4_cleanup_mcg_table(dev);
+        mlx4_cleanup_mr_table(dev);
+        mlx4_cleanup_xrcd_table(dev);
+        mlx4_cleanup_pd_table(dev);
 
-                kfree(priv);
-                pci_release_regions(pdev);
-                pci_disable_device(pdev);
-                pci_set_drvdata(pdev, NULL);
+        if (mlx4_is_master(dev))
+                mlx4_free_resource_tracker(dev,
+                                           RES_TR_FREE_STRUCTS_ONLY);
+
+        iounmap(priv->kar);
+        mlx4_uar_free(dev, &priv->driver_uar);
+        mlx4_cleanup_uar_table(dev);
+        if (!mlx4_is_slave(dev))
+                mlx4_clear_steering(dev);
+        mlx4_free_eq_table(dev);
+        if (mlx4_is_master(dev))
+                mlx4_multi_func_cleanup(dev);
+        mlx4_close_hca(dev);
+        if (mlx4_is_slave(dev))
+                mlx4_multi_func_cleanup(dev);
+        mlx4_cmd_cleanup(dev);
+
+        if (dev->flags & MLX4_FLAG_MSI_X)
+                pci_disable_msix(pdev);
+        if (dev->flags & MLX4_FLAG_SRIOV) {
+                mlx4_warn(dev, "Disabling SR-IOV\n");
+                pci_disable_sriov(pdev);
+                dev->num_vfs = 0;
         }
+
+        if (!mlx4_is_slave(dev))
+                mlx4_free_ownership(dev);
+
+        kfree(dev->caps.qp0_tunnel);
+        kfree(dev->caps.qp0_proxy);
+        kfree(dev->caps.qp1_tunnel);
+        kfree(dev->caps.qp1_proxy);
+        kfree(dev->dev_vfs);
+
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        memset(priv, 0, sizeof(*priv));
+        priv->pci_dev_data = pci_dev_data;
+        priv->removed = 1;
+}
+
+static void mlx4_remove_one(struct pci_dev *pdev)
+{
+        struct mlx4_dev  *dev  = pci_get_drvdata(pdev);
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        __mlx4_remove_one(pdev);
+        kfree(priv);
+        pci_set_drvdata(pdev, NULL);
 }
 
 int mlx4_restart_one(struct pci_dev *pdev)
@@ -2692,7 +2717,7 @@ int mlx4_restart_one(struct pci_dev *pdev)
         int               pci_dev_data;
 
         pci_dev_data = priv->pci_dev_data;
-        mlx4_remove_one(pdev);
+        __mlx4_remove_one(pdev);
         return __mlx4_init_one(pdev, pci_dev_data);
 }
 
@@ -2747,7 +2772,7 @@ MODULE_DEVICE_TABLE(pci, mlx4_pci_table);
 static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
                                               pci_channel_state_t state)
 {
-        mlx4_remove_one(pdev);
+        __mlx4_remove_one(pdev);
 
         return state == pci_channel_io_perm_failure ?
                 PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_NEED_RESET;
@@ -2755,11 +2780,11 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
 
 static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
 {
-        const struct pci_device_id *id;
-        int ret;
+        struct mlx4_dev  *dev  = pci_get_drvdata(pdev);
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int               ret;
 
-        id = pci_match_id(mlx4_pci_table, pdev);
-        ret = __mlx4_init_one(pdev, id->driver_data);
+        ret = __mlx4_init_one(pdev, priv->pci_dev_data);
 
         return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index cf8be41abb36..f9c465101963 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -800,6 +800,7 @@ struct mlx4_priv {
         spinlock_t              ctx_lock;
 
         int                     pci_dev_data;
+        int                     removed;
 
         struct list_head        pgdir_list;
         struct mutex            pgdir_mutex;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index b48737dcd3c5..ba20c721ee97 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -2139,8 +2139,6 @@ static int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)
         ahw->max_mac_filters = nic_info.max_mac_filters;
         ahw->max_mtu = nic_info.max_mtu;
 
-        adapter->max_tx_rings = ahw->max_tx_ques;
-        adapter->max_sds_rings = ahw->max_rx_ques;
         /* eSwitch capability indicates vNIC mode.
          * vNIC and SRIOV are mutually exclusive operational modes.
          * If SR-IOV capability is detected, SR-IOV physical function
@@ -2161,6 +2159,7 @@ static int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)
 int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
 {
         struct qlcnic_hardware_context *ahw = adapter->ahw;
+        u16 max_sds_rings, max_tx_rings;
         int ret;
 
         ret = qlcnic_83xx_get_nic_configuration(adapter);
@@ -2173,18 +2172,21 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
                 if (qlcnic_83xx_config_vnic_opmode(adapter))
                         return -EIO;
 
-                adapter->max_sds_rings = QLCNIC_MAX_VNIC_SDS_RINGS;
-                adapter->max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
+                max_sds_rings = QLCNIC_MAX_VNIC_SDS_RINGS;
+                max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
         } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
                 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
                 adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
                 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
-                adapter->max_sds_rings = QLCNIC_MAX_SDS_RINGS;
-                adapter->max_tx_rings = QLCNIC_MAX_TX_RINGS;
+                max_sds_rings = QLCNIC_MAX_SDS_RINGS;
+                max_tx_rings = QLCNIC_MAX_TX_RINGS;
         } else {
                 return -EIO;
         }
 
+        adapter->max_sds_rings = min(ahw->max_rx_ques, max_sds_rings);
+        adapter->max_tx_rings = min(ahw->max_tx_ques, max_tx_rings);
+
         return 0;
 }
 
@@ -2348,15 +2350,16 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
                 goto disable_intr;
         }
 
+        INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);
+
         err = qlcnic_83xx_setup_mbx_intr(adapter);
         if (err)
                 goto disable_mbx_intr;
 
         qlcnic_83xx_clear_function_resources(adapter);
-
-        INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);
-
+        qlcnic_dcb_enable(adapter->dcb);
         qlcnic_83xx_initialize_nic(adapter, 1);
+        qlcnic_dcb_get_info(adapter->dcb);
 
         /* Configure default, SR-IOV or Virtual NIC mode of operation */
         err = qlcnic_83xx_configure_opmode(adapter);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 64dcbf33d8f0..c1e11f5715b0 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -883,8 +883,6 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter,
                 npar_info->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques);
                 npar_info->capabilities = le32_to_cpu(nic_info->capabilities);
                 npar_info->max_mtu = le16_to_cpu(nic_info->max_mtu);
-                adapter->max_tx_rings = npar_info->max_tx_ques;
-                adapter->max_sds_rings = npar_info->max_rx_ques;
         }
 
         qlcnic_free_mbx_args(&cmd);
@@ -1356,6 +1354,7 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
                         arg2 &= ~BIT_3;
                 break;
         case QLCNIC_ADD_VLAN:
+                        arg1 &= ~(0x0ffff << 16);
                         arg1 |= (BIT_2 | BIT_5);
                         arg1 |= (esw_cfg->vlan_id << 16);
                         break;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c
index 7d4f54912bad..a51fe18f09a8 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c
@@ -330,8 +330,6 @@ static int __qlcnic_dcb_attach(struct qlcnic_dcb *dcb)
                 goto out_free_cfg;
         }
 
-        qlcnic_dcb_get_info(dcb);
-
         return 0;
 out_free_cfg:
         kfree(dcb->cfg);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 309d05640883..dbf75393f758 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -670,7 +670,7 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter)
         else
                 num_msix += adapter->drv_tx_rings;
 
-        if (adapter->drv_rss_rings  > 0)
+        if (adapter->drv_rss_rings > 0)
                 num_msix += adapter->drv_rss_rings;
         else
                 num_msix += adapter->drv_sds_rings;
@@ -686,19 +686,15 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter)
                         return -ENOMEM;
         }
 
-restore:
         for (vector = 0; vector < num_msix; vector++)
                 adapter->msix_entries[vector].entry = vector;
 
+restore:
         err = pci_enable_msix(pdev, adapter->msix_entries, num_msix);
-        if (err == 0) {
-                adapter->ahw->num_msix = num_msix;
-                if (adapter->drv_tss_rings > 0)
-                        adapter->drv_tx_rings = adapter->drv_tss_rings;
+        if (err > 0) {
+                if (!adapter->drv_tss_rings && !adapter->drv_rss_rings)
+                        return -ENOSPC;
 
-                if (adapter->drv_rss_rings > 0)
-                        adapter->drv_sds_rings = adapter->drv_rss_rings;
-        } else {
                 netdev_info(adapter->netdev,
                             "Unable to allocate %d MSI-X vectors, Available vectors %d\n",
                             num_msix, err);
@@ -716,12 +712,20 @@ restore:
                             "Restoring %d Tx, %d SDS rings for total %d vectors.\n",
                             adapter->drv_tx_rings, adapter->drv_sds_rings,
                             num_msix);
-                goto restore;
 
-                err = -EIO;
+                goto restore;
+        } else if (err < 0) {
+                return err;
         }
 
-        return err;
+        adapter->ahw->num_msix = num_msix;
+        if (adapter->drv_tss_rings > 0)
+                adapter->drv_tx_rings = adapter->drv_tss_rings;
+
+        if (adapter->drv_rss_rings > 0)
+                adapter->drv_sds_rings = adapter->drv_rss_rings;
+
+        return 0;
 }
 
 int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
@@ -2528,8 +2532,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_free_hw;
         }
 
-        qlcnic_dcb_enable(adapter->dcb);
-
         if (qlcnic_read_mac_addr(adapter))
                 dev_warn(&pdev->dev, "failed to read mac addr\n");
 
@@ -2549,7 +2551,10 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                          "Device does not support MSI interrupts\n");
 
         if (qlcnic_82xx_check(adapter)) {
+                qlcnic_dcb_enable(adapter->dcb);
+                qlcnic_dcb_get_info(adapter->dcb);
                 err = qlcnic_setup_intr(adapter);
+
                 if (err) {
                         dev_err(&pdev->dev, "Failed to setup interrupt\n");
                         goto err_out_disable_msi;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
index 14f748cbf0de..280137991544 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
@@ -461,6 +461,16 @@ static int qlcnic_pci_sriov_disable(struct qlcnic_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
 
+        if (pci_vfs_assigned(adapter->pdev)) {
+                netdev_err(adapter->netdev,
+                           "SR-IOV VFs belonging to port %d are assigned to VMs. SR-IOV can not be disabled on this port\n",
+                           adapter->portnum);
+                netdev_info(adapter->netdev,
+                            "Please detach SR-IOV VFs belonging to port %d from VMs, and then try to disable SR-IOV on this port\n",
+                            adapter->portnum);
+                return -EPERM;
+        }
+
         rtnl_lock();
         if (netif_running(netdev))
                 __qlcnic_down(adapter, netdev);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
index 448d156c3d08..cd346e27f2e1 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
@@ -354,7 +354,7 @@ int qlcnic_is_valid_nic_func(struct qlcnic_adapter *adapter, u8 pci_func)
 {
         int i;
 
-        for (i = 0; i < adapter->ahw->max_vnic_func; i++) {
+        for (i = 0; i < adapter->ahw->total_nic_func; i++) {
                 if (adapter->npars[i].pci_func == pci_func)
                         return i;
         }
@@ -720,6 +720,7 @@ static ssize_t qlcnic_sysfs_read_npar_config(struct file *file,
         struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
         struct qlcnic_npar_func_cfg *np_cfg;
         struct qlcnic_info nic_info;
+        u8 pci_func;
         int i, ret;
         u32 count;
 
@@ -729,26 +730,28 @@ static ssize_t qlcnic_sysfs_read_npar_config(struct file *file,
 
         count = size / sizeof(struct qlcnic_npar_func_cfg);
         for (i = 0; i < adapter->ahw->total_nic_func; i++) {
-                if (qlcnic_is_valid_nic_func(adapter, i) < 0)
-                        continue;
                 if (adapter->npars[i].pci_func >= count) {
                         dev_dbg(dev, "%s: Total nic functions[%d], App sent function count[%d]\n",
                                 __func__, adapter->ahw->total_nic_func, count);
                         continue;
                 }
-                ret = qlcnic_get_nic_info(adapter, &nic_info, i);
-                if (ret)
-                        return ret;
                 if (!adapter->npars[i].eswitch_status)
                         continue;
-                np_cfg[i].pci_func = i;
-                np_cfg[i].op_mode = (u8)nic_info.op_mode;
-                np_cfg[i].port_num = nic_info.phys_port;
-                np_cfg[i].fw_capab = nic_info.capabilities;
-                np_cfg[i].min_bw = nic_info.min_tx_bw;
-                np_cfg[i].max_bw = nic_info.max_tx_bw;
-                np_cfg[i].max_tx_queues = nic_info.max_tx_ques;
-                np_cfg[i].max_rx_queues = nic_info.max_rx_ques;
+                pci_func = adapter->npars[i].pci_func;
+                if (qlcnic_is_valid_nic_func(adapter, pci_func) < 0)
+                        continue;
+                ret = qlcnic_get_nic_info(adapter, &nic_info, pci_func);
+                if (ret)
+                        return ret;
+
+                np_cfg[pci_func].pci_func = pci_func;
+                np_cfg[pci_func].op_mode = (u8)nic_info.op_mode;
+                np_cfg[pci_func].port_num = nic_info.phys_port;
+                np_cfg[pci_func].fw_capab = nic_info.capabilities;
+                np_cfg[pci_func].min_bw = nic_info.min_tx_bw;
+                np_cfg[pci_func].max_bw = nic_info.max_tx_bw;
+                np_cfg[pci_func].max_tx_queues = nic_info.max_tx_ques;
+                np_cfg[pci_func].max_rx_queues = nic_info.max_rx_ques;
         }
         return size;
 }
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 430bb0db9bc4..e36f194673a4 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -365,7 +365,7 @@ __at86rf230_read_subreg(struct at86rf230_local *lp,
         dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
 
         if (status == 0)
-                *data = buf[1];
+                *data = (buf[1] & mask) >> shift;
 
         return status;
 }
@@ -1025,14 +1025,6 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
                 return -EINVAL;
         }
 
-        rc = at86rf230_read_subreg(lp, SR_AVDD_OK, &status);
-        if (rc)
-                return rc;
-        if (!status) {
-                dev_err(&lp->spi->dev, "AVDD error\n");
-                return -EINVAL;
-        }
-
         return 0;
 }
 
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index c55e316373a1..82355d5d155a 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1755,8 +1755,8 @@ int vxlan_xmit_skb(struct vxlan_sock *vs,
         if (err)
                 return err;
 
-        return iptunnel_xmit(rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df,
-                             false);
+        return iptunnel_xmit(vs->sock->sk, rt, skb, src, dst, IPPROTO_UDP,
+                             tos, ttl, df, false);
 }
 EXPORT_SYMBOL_GPL(vxlan_xmit_skb);
 
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 84734a805092..83c39e2858bf 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -1521,11 +1521,7 @@ static int cosa_reset_and_read_id(struct cosa_data *cosa, char *idstring)
         cosa_putstatus(cosa, 0);
         cosa_getdata8(cosa);
         cosa_putstatus(cosa, SR_RST);
-#ifdef MODULE
         msleep(500);
-#else
-        udelay(5*100000);
-#endif
         /* Disable all IRQs from the card */
         cosa_putstatus(cosa, 0);