Merge 4.6-rc7 into tty-next

We want the pty fixes in here as well so that patches can build on it.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

41 files changed, 536 insertions, 286 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a24c18eee598..befd67df08e1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -62,9 +62,8 @@ config DUMMY
           this device is consigned into oblivion) with a configurable IP
           address. It is most commonly used in order to make your currently
           inactive SLIP address seem like a real address for local programs.
-          If you use SLIP or PPP, you might want to say Y here. Since this
-          thing often comes in handy, the default is Y. It won't enlarge your
-          kernel either. What a deal. Read about it in the Network
+          If you use SLIP or PPP, you might want to say Y here. It won't
+          enlarge your kernel. What a deal. Read about it in the Network
           Administrator's Guide, available from
           <http://www.tldp.org/docs.html#guide>.
 
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index a2904029cccc..5e572b3510b9 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -2181,7 +2181,7 @@ int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
                                struct net_device *bridge)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-        int i, err;
+        int i, err = 0;
 
         mutex_lock(&ps->smi_mutex);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 12a009d720cd..72eb29ed0359 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -581,12 +581,30 @@ static inline int bnxt_alloc_rx_page(struct bnxt *bp,
         struct page *page;
         dma_addr_t mapping;
         u16 sw_prod = rxr->rx_sw_agg_prod;
+        unsigned int offset = 0;
 
-        page = alloc_page(gfp);
-        if (!page)
-                return -ENOMEM;
+        if (PAGE_SIZE > BNXT_RX_PAGE_SIZE) {
+                page = rxr->rx_page;
+                if (!page) {
+                        page = alloc_page(gfp);
+                        if (!page)
+                                return -ENOMEM;
+                        rxr->rx_page = page;
+                        rxr->rx_page_offset = 0;
+                }
+                offset = rxr->rx_page_offset;
+                rxr->rx_page_offset += BNXT_RX_PAGE_SIZE;
+                if (rxr->rx_page_offset == PAGE_SIZE)
+                        rxr->rx_page = NULL;
+                else
+                        get_page(page);
+        } else {
+                page = alloc_page(gfp);
+                if (!page)
+                        return -ENOMEM;
+        }
 
-        mapping = dma_map_page(&pdev->dev, page, 0, PAGE_SIZE,
+        mapping = dma_map_page(&pdev->dev, page, offset, BNXT_RX_PAGE_SIZE,
                                PCI_DMA_FROMDEVICE);
         if (dma_mapping_error(&pdev->dev, mapping)) {
                 __free_page(page);
@@ -601,6 +619,7 @@ static inline int bnxt_alloc_rx_page(struct bnxt *bp,
         rxr->rx_sw_agg_prod = NEXT_RX_AGG(sw_prod);
 
         rx_agg_buf->page = page;
+        rx_agg_buf->offset = offset;
         rx_agg_buf->mapping = mapping;
         rxbd->rx_bd_haddr = cpu_to_le64(mapping);
         rxbd->rx_bd_opaque = sw_prod;
@@ -642,6 +661,7 @@ static void bnxt_reuse_rx_agg_bufs(struct bnxt_napi *bnapi, u16 cp_cons,
                 page = cons_rx_buf->page;
                 cons_rx_buf->page = NULL;
                 prod_rx_buf->page = page;
+                prod_rx_buf->offset = cons_rx_buf->offset;
 
                 prod_rx_buf->mapping = cons_rx_buf->mapping;
 
@@ -709,7 +729,8 @@ static struct sk_buff *bnxt_rx_pages(struct bnxt *bp, struct bnxt_napi *bnapi,
                             RX_AGG_CMP_LEN) >> RX_AGG_CMP_LEN_SHIFT;
 
                 cons_rx_buf = &rxr->rx_agg_ring[cons];
-                skb_fill_page_desc(skb, i, cons_rx_buf->page, 0, frag_len);
+                skb_fill_page_desc(skb, i, cons_rx_buf->page,
+                                   cons_rx_buf->offset, frag_len);
                 __clear_bit(cons, rxr->rx_agg_bmap);
 
                 /* It is possible for bnxt_alloc_rx_page() to allocate
@@ -740,7 +761,7 @@ static struct sk_buff *bnxt_rx_pages(struct bnxt *bp, struct bnxt_napi *bnapi,
                         return NULL;
                 }
 
-                dma_unmap_page(&pdev->dev, mapping, PAGE_SIZE,
+                dma_unmap_page(&pdev->dev, mapping, BNXT_RX_PAGE_SIZE,
                                PCI_DMA_FROMDEVICE);
 
                 skb->data_len += frag_len;
@@ -1584,13 +1605,17 @@ static void bnxt_free_rx_skbs(struct bnxt *bp)
 
                         dma_unmap_page(&pdev->dev,
                                        dma_unmap_addr(rx_agg_buf, mapping),
-                                       PAGE_SIZE, PCI_DMA_FROMDEVICE);
+                                       BNXT_RX_PAGE_SIZE, PCI_DMA_FROMDEVICE);
 
                         rx_agg_buf->page = NULL;
                         __clear_bit(j, rxr->rx_agg_bmap);
 
                         __free_page(page);
                 }
+                if (rxr->rx_page) {
+                        __free_page(rxr->rx_page);
+                        rxr->rx_page = NULL;
+                }
         }
 }
 
@@ -1973,7 +1998,7 @@ static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr)
         if (!(bp->flags & BNXT_FLAG_AGG_RINGS))
                 return 0;
 
-        type = ((u32)PAGE_SIZE << RX_BD_LEN_SHIFT) |
+        type = ((u32)BNXT_RX_PAGE_SIZE << RX_BD_LEN_SHIFT) |
                 RX_BD_TYPE_RX_AGG_BD | RX_BD_FLAGS_SOP;
 
         bnxt_init_rxbd_pages(ring, type);
@@ -2164,7 +2189,7 @@ void bnxt_set_ring_params(struct bnxt *bp)
         bp->rx_agg_nr_pages = 0;
 
         if (bp->flags & BNXT_FLAG_TPA)
-                agg_factor = 4;
+                agg_factor = min_t(u32, 4, 65536 / BNXT_RX_PAGE_SIZE);
 
         bp->flags &= ~BNXT_FLAG_JUMBO;
         if (rx_space > PAGE_SIZE) {
@@ -3020,12 +3045,12 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)
                 /* Number of segs are log2 units, and first packet is not
                  * included as part of this units.
                  */
-                if (mss <= PAGE_SIZE) {
-                        n = PAGE_SIZE / mss;
+                if (mss <= BNXT_RX_PAGE_SIZE) {
+                        n = BNXT_RX_PAGE_SIZE / mss;
                         nsegs = (MAX_SKB_FRAGS - 1) * n;
                 } else {
-                        n = mss / PAGE_SIZE;
-                        if (mss & (PAGE_SIZE - 1))
+                        n = mss / BNXT_RX_PAGE_SIZE;
+                        if (mss & (BNXT_RX_PAGE_SIZE - 1))
                                 n++;
                         nsegs = (MAX_SKB_FRAGS - n) / n;
                 }
@@ -4309,7 +4334,7 @@ static int bnxt_setup_int_mode(struct bnxt *bp)
         if (bp->flags & BNXT_FLAG_MSIX_CAP)
                 rc = bnxt_setup_msix(bp);
 
-        if (!(bp->flags & BNXT_FLAG_USING_MSIX)) {
+        if (!(bp->flags & BNXT_FLAG_USING_MSIX) && BNXT_PF(bp)) {
                 /* fallback to INTA */
                 rc = bnxt_setup_inta(bp);
         }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 709b95b8fcba..8b823ff558ff 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -407,6 +407,15 @@ struct rx_tpa_end_cmp_ext {
 
 #define BNXT_PAGE_SIZE  (1 << BNXT_PAGE_SHIFT)
 
+/* The RXBD length is 16-bit so we can only support page sizes < 64K */
+#if (PAGE_SHIFT > 15)
+#define BNXT_RX_PAGE_SHIFT 15
+#else
+#define BNXT_RX_PAGE_SHIFT PAGE_SHIFT
+#endif
+
+#define BNXT_RX_PAGE_SIZE (1 << BNXT_RX_PAGE_SHIFT)
+
 #define BNXT_MIN_PKT_SIZE       45
 
 #define BNXT_NUM_TESTS(bp)      0
@@ -506,6 +515,7 @@ struct bnxt_sw_rx_bd {
 
 struct bnxt_sw_rx_agg_bd {
         struct page             *page;
+        unsigned int            offset;
         dma_addr_t              mapping;
 };
 
@@ -586,6 +596,9 @@ struct bnxt_rx_ring_info {
         unsigned long           *rx_agg_bmap;
         u16                     rx_agg_bmap_size;
 
+        struct page             *rx_page;
+        unsigned int            rx_page_offset;
+
         dma_addr_t              rx_desc_mapping[MAX_RX_PAGES];
         dma_addr_t              rx_agg_desc_mapping[MAX_RX_AGG_PAGES];
 
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 48a7d7dee846..a63551d0a18a 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -441,7 +441,7 @@ static int macb_mii_init(struct macb *bp)
         snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
                 bp->pdev->name, bp->pdev->id);
         bp->mii_bus->priv = bp;
-        bp->mii_bus->parent = &bp->dev->dev;
+        bp->mii_bus->parent = &bp->pdev->dev;
         pdata = dev_get_platdata(&bp->pdev->dev);
 
         dev_set_drvdata(&bp->dev->dev, bp->mii_bus);
@@ -458,7 +458,8 @@ static int macb_mii_init(struct macb *bp)
                                 struct phy_device *phydev;
 
                                 phydev = mdiobus_scan(bp->mii_bus, i);
-                                if (IS_ERR(phydev)) {
+                                if (IS_ERR(phydev) &&
+                                    PTR_ERR(phydev) != -ENODEV) {
                                         err = PTR_ERR(phydev);
                                         break;
                                 }
@@ -3019,29 +3020,36 @@ static int macb_probe(struct platform_device *pdev)
         if (err)
                 goto err_out_free_netdev;
 
+        err = macb_mii_init(bp);
+        if (err)
+                goto err_out_free_netdev;
+
+        phydev = bp->phy_dev;
+
+        netif_carrier_off(dev);
+
         err = register_netdev(dev);
         if (err) {
                 dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
-                goto err_out_unregister_netdev;
+                goto err_out_unregister_mdio;
         }
 
-        err = macb_mii_init(bp);
-        if (err)
-                goto err_out_unregister_netdev;
-
-        netif_carrier_off(dev);
+        phy_attached_info(phydev);
 
         netdev_info(dev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n",
                     macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID),
                     dev->base_addr, dev->irq, dev->dev_addr);
 
-        phydev = bp->phy_dev;
-        phy_attached_info(phydev);
-
         return 0;
 
-err_out_unregister_netdev:
-        unregister_netdev(dev);
+err_out_unregister_mdio:
+        phy_disconnect(bp->phy_dev);
+        mdiobus_unregister(bp->mii_bus);
+        mdiobus_free(bp->mii_bus);
+
+        /* Shutdown the PHY if there is a GPIO reset */
+        if (bp->reset_gpio)
+                gpiod_set_value(bp->reset_gpio, 0);
 
 err_out_free_netdev:
         free_netdev(dev);
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 60908eab3b3a..43da891fab97 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -576,7 +576,7 @@ static void setup_rss(struct adapter *adap)
         unsigned int nq0 = adap2pinfo(adap, 0)->nqsets;
         unsigned int nq1 = adap->port[1] ? adap2pinfo(adap, 1)->nqsets : 1;
         u8 cpus[SGE_QSETS + 1];
-        u16 rspq_map[RSS_TABLE_SIZE];
+        u16 rspq_map[RSS_TABLE_SIZE + 1];
 
         for (i = 0; i < SGE_QSETS; ++i)
                 cpus[i] = i;
@@ -586,6 +586,7 @@ static void setup_rss(struct adapter *adap)
                 rspq_map[i] = i % nq0;
                 rspq_map[i + RSS_TABLE_SIZE / 2] = (i % nq1) + nq0;
         }
+        rspq_map[RSS_TABLE_SIZE] = 0xffff; /* terminator */
 
         t3_config_rss(adap, F_RQFEEDBACKENABLE | F_TNLLKPEN | F_TNLMAPEN |
                       F_TNLPRTEN | F_TNL2TUPEN | F_TNL4TUPEN |
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 7fc490225da5..a6d26d351dfc 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3354,8 +3354,7 @@ static int mvneta_percpu_notifier(struct notifier_block *nfb,
                 /* Enable per-CPU interrupts on the CPU that is
                  * brought up.
                  */
-                smp_call_function_single(cpu, mvneta_percpu_enable,
-                                         pp, true);
+                mvneta_percpu_enable(pp);
 
                 /* Enable per-CPU interrupt on the one CPU we care
                  * about.
@@ -3387,8 +3386,7 @@ static int mvneta_percpu_notifier(struct notifier_block *nfb,
                 /* Disable per-CPU interrupts on the CPU that is
                  * brought down.
                  */
-                smp_call_function_single(cpu, mvneta_percpu_disable,
-                                         pp, true);
+                mvneta_percpu_disable(pp);
 
                 break;
         case CPU_DEAD:
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 7ace07dad6a3..c442f6ad15ff 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -979,6 +979,8 @@ static int pxa168_init_phy(struct net_device *dev)
                 return 0;
 
         pep->phy = mdiobus_scan(pep->smi_bus, pep->phy_addr);
+        if (IS_ERR(pep->phy))
+                return PTR_ERR(pep->phy);
         if (!pep->phy)
                 return -ENODEV;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index c0d7b7296236..a386f047c1af 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -405,7 +405,6 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
         u32 packets = 0;
         u32 bytes = 0;
         int factor = priv->cqe_factor;
-        u64 timestamp = 0;
         int done = 0;
         int budget = priv->tx_work_limit;
         u32 last_nr_txbb;
@@ -445,9 +444,12 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
                 new_index = be16_to_cpu(cqe->wqe_index) & size_mask;
 
                 do {
+                        u64 timestamp = 0;
+
                         txbbs_skipped += last_nr_txbb;
                         ring_index = (ring_index + last_nr_txbb) & size_mask;
-                        if (ring->tx_info[ring_index].ts_requested)
+
+                        if (unlikely(ring->tx_info[ring_index].ts_requested))
                                 timestamp = mlx4_en_get_cqe_ts(cqe);
 
                         /* free next descriptor */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index 1cf722eba607..559d11a443bc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -14,6 +14,7 @@ config MLX5_CORE_EN
         bool "Mellanox Technologies ConnectX-4 Ethernet support"
         depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE
         select PTP_1588_CLOCK
+        select VXLAN if MLX5_CORE=y
         default n
         ---help---
           Ethernet support in Mellanox Technologies ConnectX-4 NIC.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 879e6276c473..3881dce0cc30 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -567,6 +567,7 @@ struct mlx5e_priv {
         struct mlx5e_vxlan_db      vxlan;
 
         struct mlx5e_params        params;
+        struct workqueue_struct    *wq;
         struct work_struct         update_carrier_work;
         struct work_struct         set_rx_mode_work;
         struct delayed_work        update_stats_work;
@@ -609,7 +610,7 @@ enum mlx5e_link_mode {
         MLX5E_100GBASE_KR4       = 22,
         MLX5E_100GBASE_LR4       = 23,
         MLX5E_100BASE_TX         = 24,
-        MLX5E_100BASE_T          = 25,
+        MLX5E_1000BASE_T         = 25,
         MLX5E_10GBASE_T          = 26,
         MLX5E_25GBASE_CR         = 27,
         MLX5E_25GBASE_KR         = 28,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 68834b715f6c..3476ab844634 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -138,10 +138,10 @@ static const struct {
         [MLX5E_100BASE_TX]   = {
                 .speed      = 100,
         },
-        [MLX5E_100BASE_T]    = {
-                .supported  = SUPPORTED_100baseT_Full,
-                .advertised = ADVERTISED_100baseT_Full,
-                .speed      = 100,
+        [MLX5E_1000BASE_T]    = {
+                .supported  = SUPPORTED_1000baseT_Full,
+                .advertised = ADVERTISED_1000baseT_Full,
+                .speed      = 1000,
         },
         [MLX5E_10GBASE_T]    = {
                 .supported  = SUPPORTED_10000baseT_Full,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index e0adb604f461..d4dfc5ce516a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -262,9 +262,8 @@ static void mlx5e_update_stats_work(struct work_struct *work)
         mutex_lock(&priv->state_lock);
         if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
                 mlx5e_update_stats(priv);
-                schedule_delayed_work(dwork,
-                                      msecs_to_jiffies(
-                                              MLX5E_UPDATE_STATS_INTERVAL));
+                queue_delayed_work(priv->wq, dwork,
+                                   msecs_to_jiffies(MLX5E_UPDATE_STATS_INTERVAL));
         }
         mutex_unlock(&priv->state_lock);
 }
@@ -280,7 +279,7 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv,
         switch (event) {
         case MLX5_DEV_EVENT_PORT_UP:
         case MLX5_DEV_EVENT_PORT_DOWN:
-                schedule_work(&priv->update_carrier_work);
+                queue_work(priv->wq, &priv->update_carrier_work);
                 break;
 
         default:
@@ -1404,24 +1403,50 @@ static int mlx5e_refresh_tirs_self_loopback_enable(struct mlx5e_priv *priv)
         return 0;
 }
 
-static int mlx5e_set_dev_port_mtu(struct net_device *netdev)
+static int mlx5e_set_mtu(struct mlx5e_priv *priv, u16 mtu)
 {
-        struct mlx5e_priv *priv = netdev_priv(netdev);
         struct mlx5_core_dev *mdev = priv->mdev;
-        int hw_mtu;
+        u16 hw_mtu = MLX5E_SW2HW_MTU(mtu);
         int err;
 
-        err = mlx5_set_port_mtu(mdev, MLX5E_SW2HW_MTU(netdev->mtu), 1);
+        err = mlx5_set_port_mtu(mdev, hw_mtu, 1);
         if (err)
                 return err;
 
-        mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);
+        /* Update vport context MTU */
+        mlx5_modify_nic_vport_mtu(mdev, hw_mtu);
+        return 0;
+}
+
+static void mlx5e_query_mtu(struct mlx5e_priv *priv, u16 *mtu)
+{
+        struct mlx5_core_dev *mdev = priv->mdev;
+        u16 hw_mtu = 0;
+        int err;
 
-        if (MLX5E_HW2SW_MTU(hw_mtu) != netdev->mtu)
-                netdev_warn(netdev, "%s: Port MTU %d is different than netdev mtu %d\n",
-                            __func__, MLX5E_HW2SW_MTU(hw_mtu), netdev->mtu);
+        err = mlx5_query_nic_vport_mtu(mdev, &hw_mtu);
+        if (err || !hw_mtu) /* fallback to port oper mtu */
+                mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);
+
+        *mtu = MLX5E_HW2SW_MTU(hw_mtu);
+}
+
+static int mlx5e_set_dev_port_mtu(struct net_device *netdev)
+{
+        struct mlx5e_priv *priv = netdev_priv(netdev);
+        u16 mtu;
+        int err;
 
-        netdev->mtu = MLX5E_HW2SW_MTU(hw_mtu);
+        err = mlx5e_set_mtu(priv, netdev->mtu);
+        if (err)
+                return err;
+
+        mlx5e_query_mtu(priv, &mtu);
+        if (mtu != netdev->mtu)
+                netdev_warn(netdev, "%s: VPort MTU %d is different than netdev mtu %d\n",
+                            __func__, mtu, netdev->mtu);
+
+        netdev->mtu = mtu;
         return 0;
 }
 
@@ -1479,7 +1504,7 @@ int mlx5e_open_locked(struct net_device *netdev)
         mlx5e_update_carrier(priv);
         mlx5e_timestamp_init(priv);
 
-        schedule_delayed_work(&priv->update_stats_work, 0);
+        queue_delayed_work(priv->wq, &priv->update_stats_work, 0);
 
         return 0;
 
@@ -1935,7 +1960,7 @@ static void mlx5e_set_rx_mode(struct net_device *dev)
 {
         struct mlx5e_priv *priv = netdev_priv(dev);
 
-        schedule_work(&priv->set_rx_mode_work);
+        queue_work(priv->wq, &priv->set_rx_mode_work);
 }
 
 static int mlx5e_set_mac(struct net_device *netdev, void *addr)
@@ -1950,7 +1975,7 @@ static int mlx5e_set_mac(struct net_device *netdev, void *addr)
         ether_addr_copy(netdev->dev_addr, saddr->sa_data);
         netif_addr_unlock_bh(netdev);
 
-        schedule_work(&priv->set_rx_mode_work);
+        queue_work(priv->wq, &priv->set_rx_mode_work);
 
         return 0;
 }
@@ -1999,22 +2024,27 @@ static int mlx5e_set_features(struct net_device *netdev,
         return err;
 }
 
+#define MXL5_HW_MIN_MTU 64
+#define MXL5E_MIN_MTU (MXL5_HW_MIN_MTU + ETH_FCS_LEN)
+
 static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct mlx5e_priv *priv = netdev_priv(netdev);
         struct mlx5_core_dev *mdev = priv->mdev;
         bool was_opened;
-        int max_mtu;
+        u16 max_mtu;
+        u16 min_mtu;
         int err = 0;
 
         mlx5_query_port_max_mtu(mdev, &max_mtu, 1);
 
         max_mtu = MLX5E_HW2SW_MTU(max_mtu);
+        min_mtu = MLX5E_HW2SW_MTU(MXL5E_MIN_MTU);
 
-        if (new_mtu > max_mtu) {
+        if (new_mtu > max_mtu || new_mtu < min_mtu) {
                 netdev_err(netdev,
-                           "%s: Bad MTU (%d) > (%d) Max\n",
-                           __func__, new_mtu, max_mtu);
+                           "%s: Bad MTU (%d), valid range is: [%d..%d]\n",
+                           __func__, new_mtu, min_mtu, max_mtu);
                 return -EINVAL;
         }
 
@@ -2127,7 +2157,7 @@ static void mlx5e_add_vxlan_port(struct net_device *netdev,
         if (!mlx5e_vxlan_allowed(priv->mdev))
                 return;
 
-        mlx5e_vxlan_add_port(priv, be16_to_cpu(port));
+        mlx5e_vxlan_queue_work(priv, sa_family, be16_to_cpu(port), 1);
 }
 
 static void mlx5e_del_vxlan_port(struct net_device *netdev,
@@ -2138,7 +2168,7 @@ static void mlx5e_del_vxlan_port(struct net_device *netdev,
         if (!mlx5e_vxlan_allowed(priv->mdev))
                 return;
 
-        mlx5e_vxlan_del_port(priv, be16_to_cpu(port));
+        mlx5e_vxlan_queue_work(priv, sa_family, be16_to_cpu(port), 0);
 }
 
 static netdev_features_t mlx5e_vxlan_features_check(struct mlx5e_priv *priv,
@@ -2467,10 +2497,14 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev)
 
         priv = netdev_priv(netdev);
 
+        priv->wq = create_singlethread_workqueue("mlx5e");
+        if (!priv->wq)
+                goto err_free_netdev;
+
         err = mlx5_alloc_map_uar(mdev, &priv->cq_uar, false);
         if (err) {
                 mlx5_core_err(mdev, "alloc_map uar failed, %d\n", err);
-                goto err_free_netdev;
+                goto err_destroy_wq;
         }
 
         err = mlx5_core_alloc_pd(mdev, &priv->pdn);
@@ -2549,7 +2583,7 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev)
                 vxlan_get_rx_port(netdev);
 
         mlx5e_enable_async_events(priv);
-        schedule_work(&priv->set_rx_mode_work);
+        queue_work(priv->wq, &priv->set_rx_mode_work);
 
         return priv;
 
@@ -2586,6 +2620,9 @@ err_dealloc_pd:
 err_unmap_free_uar:
         mlx5_unmap_free_uar(mdev, &priv->cq_uar);
 
+err_destroy_wq:
+        destroy_workqueue(priv->wq);
+
 err_free_netdev:
         free_netdev(netdev);
 
@@ -2599,10 +2636,19 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
 
         set_bit(MLX5E_STATE_DESTROYING, &priv->state);
 
-        schedule_work(&priv->set_rx_mode_work);
+        queue_work(priv->wq, &priv->set_rx_mode_work);
         mlx5e_disable_async_events(priv);
-        flush_scheduled_work();
-        unregister_netdev(netdev);
+        flush_workqueue(priv->wq);
+        if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) {
+                netif_device_detach(netdev);
+                mutex_lock(&priv->state_lock);
+                if (test_bit(MLX5E_STATE_OPENED, &priv->state))
+                        mlx5e_close_locked(netdev);
+                mutex_unlock(&priv->state_lock);
+        } else {
+                unregister_netdev(netdev);
+        }
+
         mlx5e_tc_cleanup(priv);
         mlx5e_vxlan_cleanup(priv);
         mlx5e_destroy_flow_tables(priv);
@@ -2615,7 +2661,11 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
         mlx5_core_dealloc_transport_domain(priv->mdev, priv->tdn);
         mlx5_core_dealloc_pd(priv->mdev, priv->pdn);
         mlx5_unmap_free_uar(priv->mdev, &priv->cq_uar);
-        free_netdev(netdev);
+        cancel_delayed_work_sync(&priv->update_stats_work);
+        destroy_workqueue(priv->wq);
+
+        if (!test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state))
+                free_netdev(netdev);
 }
 
 static void *mlx5e_get_netdev(void *vpriv)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 5121be4675d1..89cce97d46c6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1065,33 +1065,6 @@ unlock_fg:
         return rule;
 }
 
-static struct mlx5_flow_rule *add_rule_to_auto_fg(struct mlx5_flow_table *ft,
-                                                  u8 match_criteria_enable,
-                                                  u32 *match_criteria,
-                                                  u32 *match_value,
-                                                  u8 action,
-                                                  u32 flow_tag,
-                                                  struct mlx5_flow_destination *dest)
-{
-        struct mlx5_flow_rule *rule;
-        struct mlx5_flow_group *g;
-
-        g = create_autogroup(ft, match_criteria_enable, match_criteria);
-        if (IS_ERR(g))
-                return (void *)g;
-
-        rule = add_rule_fg(g, match_value,
-                           action, flow_tag, dest);
-        if (IS_ERR(rule)) {
-                /* Remove assumes refcount > 0 and autogroup creates a group
-                 * with a refcount = 0.
-                 */
-                tree_get_node(&g->node);
-                tree_remove_node(&g->node);
-        }
-        return rule;
-}
-
 static struct mlx5_flow_rule *
 _mlx5_add_flow_rule(struct mlx5_flow_table *ft,
                     u8 match_criteria_enable,
@@ -1119,8 +1092,23 @@ _mlx5_add_flow_rule(struct mlx5_flow_table *ft,
                                 goto unlock;
                 }
 
-        rule = add_rule_to_auto_fg(ft, match_criteria_enable, match_criteria,
-                                   match_value, action, flow_tag, dest);
+        g = create_autogroup(ft, match_criteria_enable, match_criteria);
+        if (IS_ERR(g)) {
+                rule = (void *)g;
+                goto unlock;
+        }
+
+        rule = add_rule_fg(g, match_value,
+                           action, flow_tag, dest);
+        if (IS_ERR(rule)) {
+                /* Remove assumes refcount > 0 and autogroup creates a group
+                 * with a refcount = 0.
+                 */
+                unlock_ref_node(&ft->node);
+                tree_get_node(&g->node);
+                tree_remove_node(&g->node);
+                return rule;
+        }
 unlock:
         unlock_ref_node(&ft->node);
         return rule;
@@ -1288,7 +1276,7 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev,
 {
         struct mlx5_flow_root_namespace *root_ns = dev->priv.root_ns;
         int prio;
-        static struct fs_prio *fs_prio;
+        struct fs_prio *fs_prio;
         struct mlx5_flow_namespace *ns;
 
         if (!root_ns)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 3f3b2fae4991..6892746fd10d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -966,7 +966,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
         int err;
 
         mutex_lock(&dev->intf_state_mutex);
-        if (dev->interface_state == MLX5_INTERFACE_STATE_UP) {
+        if (test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {
                 dev_warn(&dev->pdev->dev, "%s: interface is up, NOP\n",
                          __func__);
                 goto out;
@@ -1133,7 +1133,8 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
         if (err)
                 pr_info("failed request module on %s\n", MLX5_IB_MOD);
 
-        dev->interface_state = MLX5_INTERFACE_STATE_UP;
+        clear_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state);
+        set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);
 out:
         mutex_unlock(&dev->intf_state_mutex);
 
@@ -1207,7 +1208,7 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
         }
 
         mutex_lock(&dev->intf_state_mutex);
-        if (dev->interface_state == MLX5_INTERFACE_STATE_DOWN) {
+        if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {
                 dev_warn(&dev->pdev->dev, "%s: interface is down, NOP\n",
                          __func__);
                 goto out;
@@ -1241,7 +1242,8 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
         mlx5_cmd_cleanup(dev);
 
 out:
-        dev->interface_state = MLX5_INTERFACE_STATE_DOWN;
+        clear_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);
+        set_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state);
         mutex_unlock(&dev->intf_state_mutex);
         return err;
 }
@@ -1452,6 +1454,18 @@ static const struct pci_error_handlers mlx5_err_handler = {
         .resume         = mlx5_pci_resume
 };
 
+static void shutdown(struct pci_dev *pdev)
+{
+        struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);
+        struct mlx5_priv *priv = &dev->priv;
+
+        dev_info(&pdev->dev, "Shutdown was called\n");
+        /* Notify mlx5 clients that the kernel is being shut down */
+        set_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &dev->intf_state);
+        mlx5_unload_one(dev, priv);
+        mlx5_pci_disable_device(dev);
+}
+
 static const struct pci_device_id mlx5_core_pci_table[] = {
         { PCI_VDEVICE(MELLANOX, 0x1011) },                      /* Connect-IB */
         { PCI_VDEVICE(MELLANOX, 0x1012), MLX5_PCI_DEV_IS_VF},   /* Connect-IB VF */
@@ -1459,6 +1473,8 @@ static const struct pci_device_id mlx5_core_pci_table[] = {
         { PCI_VDEVICE(MELLANOX, 0x1014), MLX5_PCI_DEV_IS_VF},   /* ConnectX-4 VF */
         { PCI_VDEVICE(MELLANOX, 0x1015) },                      /* ConnectX-4LX */
         { PCI_VDEVICE(MELLANOX, 0x1016), MLX5_PCI_DEV_IS_VF},   /* ConnectX-4LX VF */
+        { PCI_VDEVICE(MELLANOX, 0x1017) },                      /* ConnectX-5 */
+        { PCI_VDEVICE(MELLANOX, 0x1018), MLX5_PCI_DEV_IS_VF},   /* ConnectX-5 VF */
         { 0, }
 };
 
@@ -1469,6 +1485,7 @@ static struct pci_driver mlx5_core_driver = {
         .id_table       = mlx5_core_pci_table,
         .probe          = init_one,
         .remove         = remove_one,
+        .shutdown       = shutdown,
         .err_handler    = &mlx5_err_handler,
         .sriov_configure   = mlx5_core_sriov_configure,
 };
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c
index ae378c575deb..53cc1e2c693b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
@@ -247,8 +247,8 @@ int mlx5_query_port_admin_status(struct mlx5_core_dev *dev,
 }
 EXPORT_SYMBOL_GPL(mlx5_query_port_admin_status);
 
-static void mlx5_query_port_mtu(struct mlx5_core_dev *dev, int *admin_mtu,
-                                int *max_mtu, int *oper_mtu, u8 port)
+static void mlx5_query_port_mtu(struct mlx5_core_dev *dev, u16 *admin_mtu,
+                                u16 *max_mtu, u16 *oper_mtu, u8 port)
 {
         u32 in[MLX5_ST_SZ_DW(pmtu_reg)];
         u32 out[MLX5_ST_SZ_DW(pmtu_reg)];
@@ -268,7 +268,7 @@ static void mlx5_query_port_mtu(struct mlx5_core_dev *dev, int *admin_mtu,
                 *admin_mtu = MLX5_GET(pmtu_reg, out, admin_mtu);
 }
 
-int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu, u8 port)
+int mlx5_set_port_mtu(struct mlx5_core_dev *dev, u16 mtu, u8 port)
 {
         u32 in[MLX5_ST_SZ_DW(pmtu_reg)];
         u32 out[MLX5_ST_SZ_DW(pmtu_reg)];
@@ -283,14 +283,14 @@ int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu, u8 port)
 }
 EXPORT_SYMBOL_GPL(mlx5_set_port_mtu);
 
-void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, int *max_mtu,
+void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, u16 *max_mtu,
                              u8 port)
 {
         mlx5_query_port_mtu(dev, NULL, max_mtu, NULL, port);
 }
 EXPORT_SYMBOL_GPL(mlx5_query_port_max_mtu);
 
-void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, int *oper_mtu,
+void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, u16 *oper_mtu,
                               u8 port)
 {
         mlx5_query_port_mtu(dev, NULL, NULL, oper_mtu, port);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/uar.c b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
index 8ba080e441a1..5ff8af472bf5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/uar.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
@@ -269,8 +269,10 @@ EXPORT_SYMBOL(mlx5_alloc_map_uar);
 
 void mlx5_unmap_free_uar(struct mlx5_core_dev *mdev, struct mlx5_uar *uar)
 {
-        iounmap(uar->map);
-        iounmap(uar->bf_map);
+        if (uar->map)
+                iounmap(uar->map);
+        else
+                iounmap(uar->bf_map);
         mlx5_cmd_free_uar(mdev, uar->index);
 }
 EXPORT_SYMBOL(mlx5_unmap_free_uar);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index bd518405859e..b69dadcfb897 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -196,6 +196,46 @@ int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *mdev,
 }
 EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_mac_address);
 
+int mlx5_query_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 *mtu)
+{
+        int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out);
+        u32 *out;
+        int err;
+
+        out = mlx5_vzalloc(outlen);
+        if (!out)
+                return -ENOMEM;
+
+        err = mlx5_query_nic_vport_context(mdev, 0, out, outlen);
+        if (!err)
+                *mtu = MLX5_GET(query_nic_vport_context_out, out,
+                                nic_vport_context.mtu);
+
+        kvfree(out);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_mtu);
+
+int mlx5_modify_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 mtu)
+{
+        int inlen = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in);
+        void *in;
+        int err;
+
+        in = mlx5_vzalloc(inlen);
+        if (!in)
+                return -ENOMEM;
+
+        MLX5_SET(modify_nic_vport_context_in, in, field_select.mtu, 1);
+        MLX5_SET(modify_nic_vport_context_in, in, nic_vport_context.mtu, mtu);
+
+        err = mlx5_modify_nic_vport_context(mdev, in, inlen);
+
+        kvfree(in);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_mtu);
+
 int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev,
                                   u32 vport,
                                   enum mlx5_list_type list_type,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
index 9f10df25f3cd..f2fd1ef16da7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
@@ -95,21 +95,22 @@ struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port)
         return vxlan;
 }
 
-int mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)
+static void mlx5e_vxlan_add_port(struct work_struct *work)
 {
+        struct mlx5e_vxlan_work *vxlan_work =
+                container_of(work, struct mlx5e_vxlan_work, work);
+        struct mlx5e_priv *priv = vxlan_work->priv;
         struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;
+        u16 port = vxlan_work->port;
         struct mlx5e_vxlan *vxlan;
         int err;
 
-        err = mlx5e_vxlan_core_add_port_cmd(priv->mdev, port);
-        if (err)
-                return err;
+        if (mlx5e_vxlan_core_add_port_cmd(priv->mdev, port))
+                goto free_work;
 
         vxlan = kzalloc(sizeof(*vxlan), GFP_KERNEL);
-        if (!vxlan) {
-                err = -ENOMEM;
+        if (!vxlan)
                 goto err_delete_port;
-        }
 
         vxlan->udp_port = port;
 
@@ -119,13 +120,14 @@ int mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)
         if (err)
                 goto err_free;
 
-        return 0;
+        goto free_work;
 
 err_free:
         kfree(vxlan);
 err_delete_port:
         mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);
-        return err;
+free_work:
+        kfree(vxlan_work);
 }
 
 static void __mlx5e_vxlan_core_del_port(struct mlx5e_priv *priv, u16 port)
@@ -145,12 +147,36 @@ static void __mlx5e_vxlan_core_del_port(struct mlx5e_priv *priv, u16 port)
         kfree(vxlan);
 }
 
-void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port)
+static void mlx5e_vxlan_del_port(struct work_struct *work)
 {
-        if (!mlx5e_vxlan_lookup_port(priv, port))
-                return;
+        struct mlx5e_vxlan_work *vxlan_work =
+                container_of(work, struct mlx5e_vxlan_work, work);
+        struct mlx5e_priv *priv = vxlan_work->priv;
+        u16 port = vxlan_work->port;
 
         __mlx5e_vxlan_core_del_port(priv, port);
+
+        kfree(vxlan_work);
+}
+
+void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, sa_family_t sa_family,
+                            u16 port, int add)
+{
+        struct mlx5e_vxlan_work *vxlan_work;
+
+        vxlan_work = kmalloc(sizeof(*vxlan_work), GFP_ATOMIC);
+        if (!vxlan_work)
+                return;
+
+        if (add)
+                INIT_WORK(&vxlan_work->work, mlx5e_vxlan_add_port);
+        else
+                INIT_WORK(&vxlan_work->work, mlx5e_vxlan_del_port);
+
+        vxlan_work->priv = priv;
+        vxlan_work->port = port;
+        vxlan_work->sa_family = sa_family;
+        queue_work(priv->wq, &vxlan_work->work);
 }
 
 void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
index a01685056ab1..129f3527aa14 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
@@ -39,6 +39,13 @@ struct mlx5e_vxlan {
         u16 udp_port;
 };
 
+struct mlx5e_vxlan_work {
+        struct work_struct      work;
+        struct mlx5e_priv       *priv;
+        sa_family_t             sa_family;
+        u16                     port;
+};
+
 static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev)
 {
         return (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) &&
@@ -46,8 +53,8 @@ static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev)
 }
 
 void mlx5e_vxlan_init(struct mlx5e_priv *priv);
-int  mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port);
-void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port);
+void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, sa_family_t sa_family,
+                            u16 port, int add);
 struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port);
 void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv);
 
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 270c9eeb7ab6..6d1a956e3f77 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -2668,9 +2668,9 @@ static int myri10ge_close(struct net_device *dev)
 
         del_timer_sync(&mgp->watchdog_timer);
         mgp->running = MYRI10GE_ETH_STOPPING;
-        local_bh_disable(); /* myri10ge_ss_lock_napi needs bh disabled */
         for (i = 0; i < mgp->num_slices; i++) {
                 napi_disable(&mgp->ss[i].napi);
+                local_bh_disable(); /* myri10ge_ss_lock_napi needs this */
                 /* Lock the slice to prevent the busy_poll handler from
                  * accessing it.  Later when we bring the NIC up, myri10ge_open
                  * resets the slice including this lock.
@@ -2679,8 +2679,8 @@ static int myri10ge_close(struct net_device *dev)
                         pr_info("Slice %d locked\n", i);
                         mdelay(1);
                 }
+                local_bh_enable();
         }
-        local_bh_enable();
         netif_carrier_off(dev);
 
         netif_tx_stop_all_queues(dev);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 55007f1e6bbc..caf6ddb7ea76 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -37,8 +37,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 3
-#define _QLCNIC_LINUX_SUBVERSION 63
-#define QLCNIC_LINUX_VERSIONID  "5.3.63"
+#define _QLCNIC_LINUX_SUBVERSION 64
+#define QLCNIC_LINUX_VERSIONID  "5.3.64"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 98d33d462c6c..1681084cc96f 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -1920,6 +1920,10 @@ static int efx_ef10_alloc_rss_context(struct efx_nic *efx, u32 *context,
                 return 0;
         }
 
+        if (nic_data->datapath_caps &
+            1 << MC_CMD_GET_CAPABILITIES_OUT_RX_RSS_LIMITED_LBN)
+                return -EOPNOTSUPP;
+
         MCDI_SET_DWORD(inbuf, RSS_CONTEXT_ALLOC_IN_UPSTREAM_PORT_ID,
                        nic_data->vport_id);
         MCDI_SET_DWORD(inbuf, RSS_CONTEXT_ALLOC_IN_TYPE, alloc_type);
@@ -2923,9 +2927,16 @@ static void efx_ef10_filter_push_prep(struct efx_nic *efx,
                                       bool replacing)
 {
         struct efx_ef10_nic_data *nic_data = efx->nic_data;
+        u32 flags = spec->flags;
 
         memset(inbuf, 0, MC_CMD_FILTER_OP_IN_LEN);
 
+        /* Remove RSS flag if we don't have an RSS context. */
+        if (flags & EFX_FILTER_FLAG_RX_RSS &&
+            spec->rss_context == EFX_FILTER_RSS_CONTEXT_DEFAULT &&
+            nic_data->rx_rss_context == EFX_EF10_RSS_CONTEXT_INVALID)
+                flags &= ~EFX_FILTER_FLAG_RX_RSS;
+
         if (replacing) {
                 MCDI_SET_DWORD(inbuf, FILTER_OP_IN_OP,
                                MC_CMD_FILTER_OP_IN_OP_REPLACE);
@@ -2985,10 +2996,10 @@ static void efx_ef10_filter_push_prep(struct efx_nic *efx,
                        spec->dmaq_id == EFX_FILTER_RX_DMAQ_ID_DROP ?
                        0 : spec->dmaq_id);
         MCDI_SET_DWORD(inbuf, FILTER_OP_IN_RX_MODE,
-                       (spec->flags & EFX_FILTER_FLAG_RX_RSS) ?
+                       (flags & EFX_FILTER_FLAG_RX_RSS) ?
                        MC_CMD_FILTER_OP_IN_RX_MODE_RSS :
                        MC_CMD_FILTER_OP_IN_RX_MODE_SIMPLE);
-        if (spec->flags & EFX_FILTER_FLAG_RX_RSS)
+        if (flags & EFX_FILTER_FLAG_RX_RSS)
                 MCDI_SET_DWORD(inbuf, FILTER_OP_IN_RX_CONTEXT,
                                spec->rss_context !=
                                EFX_FILTER_RSS_CONTEXT_DEFAULT ?
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 44022b1845ce..afb90d129cb6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -49,7 +49,6 @@ struct socfpga_dwmac {
         u32     reg_shift;
         struct  device *dev;
         struct regmap *sys_mgr_base_addr;
-        struct reset_control *stmmac_rst;
         void __iomem *splitter_base;
         bool f2h_ptp_ref_clk;
 };
@@ -92,15 +91,6 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
         struct device_node *np_splitter;
         struct resource res_splitter;
 
-        dwmac->stmmac_rst = devm_reset_control_get(dev,
-                                                  STMMAC_RESOURCE_NAME);
-        if (IS_ERR(dwmac->stmmac_rst)) {
-                dev_info(dev, "Could not get reset control!\n");
-                if (PTR_ERR(dwmac->stmmac_rst) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-                dwmac->stmmac_rst = NULL;
-        }
-
         dwmac->interface = of_get_phy_mode(np);
 
         sys_mgr_base_addr = syscon_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
@@ -194,30 +184,23 @@ static int socfpga_dwmac_setup(struct socfpga_dwmac *dwmac)
         return 0;
 }
 
-static void socfpga_dwmac_exit(struct platform_device *pdev, void *priv)
-{
-        struct socfpga_dwmac    *dwmac = priv;
-
-        /* On socfpga platform exit, assert and hold reset to the
-         * enet controller - the default state after a hard reset.
-         */
-        if (dwmac->stmmac_rst)
-                reset_control_assert(dwmac->stmmac_rst);
-}
-
 static int socfpga_dwmac_init(struct platform_device *pdev, void *priv)
 {
-        struct socfpga_dwmac    *dwmac = priv;
+        struct socfpga_dwmac *dwmac = priv;
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct stmmac_priv *stpriv = NULL;
         int ret = 0;
 
-        if (ndev)
-                stpriv = netdev_priv(ndev);
+        if (!ndev)
+                return -EINVAL;
+
+        stpriv = netdev_priv(ndev);
+        if (!stpriv)
+                return -EINVAL;
 
         /* Assert reset to the enet controller before changing the phy mode */
-        if (dwmac->stmmac_rst)
-                reset_control_assert(dwmac->stmmac_rst);
+        if (stpriv->stmmac_rst)
+                reset_control_assert(stpriv->stmmac_rst);
 
         /* Setup the phy mode in the system manager registers according to
          * devicetree configuration
@@ -227,8 +210,8 @@ static int socfpga_dwmac_init(struct platform_device *pdev, void *priv)
         /* Deassert reset for the phy configuration to be sampled by
          * the enet controller, and operation to start in requested mode
          */
-        if (dwmac->stmmac_rst)
-                reset_control_deassert(dwmac->stmmac_rst);
+        if (stpriv->stmmac_rst)
+                reset_control_deassert(stpriv->stmmac_rst);
 
         /* Before the enet controller is suspended, the phy is suspended.
          * This causes the phy clock to be gated. The enet controller is
@@ -245,7 +228,7 @@ static int socfpga_dwmac_init(struct platform_device *pdev, void *priv)
          * control register 0, and can be modified by the phy driver
          * framework.
          */
-        if (stpriv && stpriv->phydev)
+        if (stpriv->phydev)
                 phy_resume(stpriv->phydev);
 
         return ret;
@@ -285,14 +268,13 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
 
         plat_dat->bsp_priv = dwmac;
         plat_dat->init = socfpga_dwmac_init;
-        plat_dat->exit = socfpga_dwmac_exit;
         plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed;
 
-        ret = socfpga_dwmac_init(pdev, plat_dat->bsp_priv);
-        if (ret)
-                return ret;
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (!ret)
+                ret = socfpga_dwmac_init(pdev, dwmac);
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        return ret;
 }
 
 static const struct of_device_id socfpga_dwmac_match[] = {
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index bbb77cd8ad67..e2fcdf1eec44 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -367,7 +367,6 @@ struct cpsw_priv {
         spinlock_t                      lock;
         struct platform_device          *pdev;
         struct net_device               *ndev;
-        struct device_node              *phy_node;
         struct napi_struct              napi_rx;
         struct napi_struct              napi_tx;
         struct device                   *dev;
@@ -1148,25 +1147,34 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)
                 cpsw_ale_add_mcast(priv->ale, priv->ndev->broadcast,
                                    1 << slave_port, 0, 0, ALE_MCAST_FWD_2);
 
-        if (priv->phy_node)
-                slave->phy = of_phy_connect(priv->ndev, priv->phy_node,
+        if (slave->data->phy_node) {
+                slave->phy = of_phy_connect(priv->ndev, slave->data->phy_node,
                                  &cpsw_adjust_link, 0, slave->data->phy_if);
-        else
+                if (!slave->phy) {
+                        dev_err(priv->dev, "phy \"%s\" not found on slave %d\n",
+                                slave->data->phy_node->full_name,
+                                slave->slave_num);
+                        return;
+                }
+        } else {
                 slave->phy = phy_connect(priv->ndev, slave->data->phy_id,
                                  &cpsw_adjust_link, slave->data->phy_if);
-        if (IS_ERR(slave->phy)) {
-                dev_err(priv->dev, "phy %s not found on slave %d\n",
-                        slave->data->phy_id, slave->slave_num);
-                slave->phy = NULL;
-        } else {
-                phy_attached_info(slave->phy);
+                if (IS_ERR(slave->phy)) {
+                        dev_err(priv->dev,
+                                "phy \"%s\" not found on slave %d, err %ld\n",
+                                slave->data->phy_id, slave->slave_num,
+                                PTR_ERR(slave->phy));
+                        slave->phy = NULL;
+                        return;
+                }
+        }
 
-                phy_start(slave->phy);
+        phy_attached_info(slave->phy);
 
-                /* Configure GMII_SEL register */
-                cpsw_phy_sel(&priv->pdev->dev, slave->phy->interface,
-                             slave->slave_num);
-        }
+        phy_start(slave->phy);
+
+        /* Configure GMII_SEL register */
+        cpsw_phy_sel(&priv->pdev->dev, slave->phy->interface, slave->slave_num);
 }
 
 static inline void cpsw_add_default_vlan(struct cpsw_priv *priv)
@@ -1940,12 +1948,11 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv,
         slave->port_vlan = data->dual_emac_res_vlan;
 }
 
-static int cpsw_probe_dt(struct cpsw_priv *priv,
+static int cpsw_probe_dt(struct cpsw_platform_data *data,
                          struct platform_device *pdev)
 {
         struct device_node *node = pdev->dev.of_node;
         struct device_node *slave_node;
-        struct cpsw_platform_data *data = &priv->data;
         int i = 0, ret;
         u32 prop;
 
@@ -2033,25 +2040,21 @@ static int cpsw_probe_dt(struct cpsw_priv *priv,
                 if (strcmp(slave_node->name, "slave"))
                         continue;
 
-                priv->phy_node = of_parse_phandle(slave_node, "phy-handle", 0);
+                slave_data->phy_node = of_parse_phandle(slave_node,
+                                                        "phy-handle", 0);
                 parp = of_get_property(slave_node, "phy_id", &lenp);
-                if (of_phy_is_fixed_link(slave_node)) {
-                        struct device_node *phy_node;
-                        struct phy_device *phy_dev;
-
+                if (slave_data->phy_node) {
+                        dev_dbg(&pdev->dev,
+                                "slave[%d] using phy-handle=\"%s\"\n",
+                                i, slave_data->phy_node->full_name);
+                } else if (of_phy_is_fixed_link(slave_node)) {
                         /* In the case of a fixed PHY, the DT node associated
                          * to the PHY is the Ethernet MAC DT node.
                          */
                         ret = of_phy_register_fixed_link(slave_node);
                         if (ret)
                                 return ret;
-                        phy_node = of_node_get(slave_node);
-                        phy_dev = of_phy_find_device(phy_node);
-                        if (!phy_dev)
-                                return -ENODEV;
-                        snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
-                                 PHY_ID_FMT, phy_dev->mdio.bus->id,
-                                 phy_dev->mdio.addr);
+                        slave_data->phy_node = of_node_get(slave_node);
                 } else if (parp) {
                         u32 phyid;
                         struct device_node *mdio_node;
@@ -2072,7 +2075,9 @@ static int cpsw_probe_dt(struct cpsw_priv *priv,
                         snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
                                  PHY_ID_FMT, mdio->name, phyid);
                 } else {
-                        dev_err(&pdev->dev, "No slave[%d] phy_id or fixed-link property\n", i);
+                        dev_err(&pdev->dev,
+                                "No slave[%d] phy_id, phy-handle, or fixed-link property\n",
+                                i);
                         goto no_phy_slave;
                 }
                 slave_data->phy_if = of_get_phy_mode(slave_node);
@@ -2275,7 +2280,7 @@ static int cpsw_probe(struct platform_device *pdev)
         /* Select default pin state */
         pinctrl_pm_select_default_state(&pdev->dev);
 
-        if (cpsw_probe_dt(priv, pdev)) {
+        if (cpsw_probe_dt(&priv->data, pdev)) {
                 dev_err(&pdev->dev, "cpsw: platform data missing\n");
                 ret = -ENODEV;
                 goto clean_runtime_disable_ret;
diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h
index 442a7038e660..e50afd1b2eda 100644
--- a/drivers/net/ethernet/ti/cpsw.h
+++ b/drivers/net/ethernet/ti/cpsw.h
@@ -18,6 +18,7 @@
 #include <linux/phy.h>
 
 struct cpsw_slave_data {
+        struct device_node *phy_node;
         char            phy_id[MII_BUS_ID_SIZE];
         int             phy_if;
         u8              mac_addr[ETH_ALEN];
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 58d58f002559..f56d66e6ec15 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1512,7 +1512,10 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)
 
         /* TODO: Add phy read and write and private statistics get feature */
 
-        return phy_mii_ioctl(priv->phydev, ifrq, cmd);
+        if (priv->phydev)
+                return phy_mii_ioctl(priv->phydev, ifrq, cmd);
+        else
+                return -EOPNOTSUPP;
 }
 
 static int match_first_device(struct device *dev, void *data)
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 13214a6492ac..743b18266a7c 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1622,7 +1622,7 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                         continue;
 
                 /* copy hw scan info */
-                memcpy(target->hwinfo, scan_info, scan_info->size);
+                memcpy(target->hwinfo, scan_info, be16_to_cpu(scan_info->size));
                 target->essid_len = strnlen(scan_info->essid,
                                             sizeof(scan_info->essid));
                 target->rate_len = 0;
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 84d3e5ca8817..c6385617bfb2 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -880,12 +880,12 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
         macsec_skb_cb(skb)->valid = false;
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (!skb)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         req = aead_request_alloc(rx_sa->key.tfm, GFP_ATOMIC);
         if (!req) {
                 kfree_skb(skb);
-                return NULL;
+                return ERR_PTR(-ENOMEM);
         }
 
         hdr = (struct macsec_eth_header *)skb->data;
@@ -905,7 +905,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
                 skb = skb_unshare(skb, GFP_ATOMIC);
                 if (!skb) {
                         aead_request_free(req);
-                        return NULL;
+                        return ERR_PTR(-ENOMEM);
                 }
         } else {
                 /* integrity only: all headers + data authenticated */
@@ -921,14 +921,14 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
         dev_hold(dev);
         ret = crypto_aead_decrypt(req);
         if (ret == -EINPROGRESS) {
-                return NULL;
+                return ERR_PTR(ret);
         } else if (ret != 0) {
                 /* decryption/authentication failed
                  * 10.6 if validateFrames is disabled, deliver anyway
                  */
                 if (ret != -EBADMSG) {
                         kfree_skb(skb);
-                        skb = NULL;
+                        skb = ERR_PTR(ret);
                 }
         } else {
                 macsec_skb_cb(skb)->valid = true;
@@ -1146,8 +1146,10 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
             secy->validate_frames != MACSEC_VALIDATE_DISABLED)
                 skb = macsec_decrypt(skb, dev, rx_sa, sci, secy);
 
-        if (!skb) {
-                macsec_rxsa_put(rx_sa);
+        if (IS_ERR(skb)) {
+                /* the decrypt callback needs the reference */
+                if (PTR_ERR(skb) != -EINPROGRESS)
+                        macsec_rxsa_put(rx_sa);
                 rcu_read_unlock();
                 *pskb = NULL;
                 return RX_HANDLER_CONSUMED;
@@ -1161,7 +1163,8 @@ deliver:
                             macsec_extra_len(macsec_skb_cb(skb)->has_sci));
         macsec_reset_skb(skb, secy->netdev);
 
-        macsec_rxsa_put(rx_sa);
+        if (rx_sa)
+                macsec_rxsa_put(rx_sa);
         count_rx(dev, skb->len);
 
         rcu_read_unlock();
@@ -1622,8 +1625,9 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info)
         }
 
         rx_sa = kmalloc(sizeof(*rx_sa), GFP_KERNEL);
-        if (init_rx_sa(rx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]), secy->key_len,
-                       secy->icv_len)) {
+        if (!rx_sa || init_rx_sa(rx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]),
+                                 secy->key_len, secy->icv_len)) {
+                kfree(rx_sa);
                 rtnl_unlock();
                 return -ENOMEM;
         }
@@ -1768,6 +1772,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
         tx_sa = kmalloc(sizeof(*tx_sa), GFP_KERNEL);
         if (!tx_sa || init_tx_sa(tx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]),
                                  secy->key_len, secy->icv_len)) {
+                kfree(tx_sa);
                 rtnl_unlock();
                 return -ENOMEM;
         }
@@ -2227,7 +2232,8 @@ static int nla_put_secy(struct macsec_secy *secy, struct sk_buff *skb)
                 return 1;
 
         if (nla_put_sci(skb, MACSEC_SECY_ATTR_SCI, secy->sci) ||
-            nla_put_u64(skb, MACSEC_SECY_ATTR_CIPHER_SUITE, DEFAULT_CIPHER_ID) ||
+            nla_put_u64(skb, MACSEC_SECY_ATTR_CIPHER_SUITE,
+                        MACSEC_DEFAULT_CIPHER_ID) ||
             nla_put_u8(skb, MACSEC_SECY_ATTR_ICV_LEN, secy->icv_len) ||
             nla_put_u8(skb, MACSEC_SECY_ATTR_OPER, secy->operational) ||
             nla_put_u8(skb, MACSEC_SECY_ATTR_PROTECT, secy->protect_frames) ||
@@ -2268,7 +2274,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
         if (!hdr)
                 return -EMSGSIZE;
 
-        rtnl_lock();
+        genl_dump_check_consistent(cb, hdr, &macsec_fam);
 
         if (nla_put_u32(skb, MACSEC_ATTR_IFINDEX, dev->ifindex))
                 goto nla_put_failure;
@@ -2429,18 +2435,17 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
 
         nla_nest_end(skb, rxsc_list);
 
-        rtnl_unlock();
-
         genlmsg_end(skb, hdr);
 
         return 0;
 
 nla_put_failure:
-        rtnl_unlock();
         genlmsg_cancel(skb, hdr);
         return -EMSGSIZE;
 }
 
+static int macsec_generation = 1; /* protected by RTNL */
+
 static int macsec_dump_txsc(struct sk_buff *skb, struct netlink_callback *cb)
 {
         struct net *net = sock_net(skb->sk);
@@ -2450,6 +2455,10 @@ static int macsec_dump_txsc(struct sk_buff *skb, struct netlink_callback *cb)
         dev_idx = cb->args[0];
 
         d = 0;
+        rtnl_lock();
+
+        cb->seq = macsec_generation;
+
         for_each_netdev(net, dev) {
                 struct macsec_secy *secy;
 
@@ -2467,6 +2476,7 @@ next:
         }
 
 done:
+        rtnl_unlock();
         cb->args[0] = d;
         return skb->len;
 }
@@ -2920,10 +2930,14 @@ static void macsec_dellink(struct net_device *dev, struct list_head *head)
         struct net_device *real_dev = macsec->real_dev;
         struct macsec_rxh_data *rxd = macsec_data_rtnl(real_dev);
 
+        macsec_generation++;
+
         unregister_netdevice_queue(dev, head);
         list_del_rcu(&macsec->secys);
-        if (list_empty(&rxd->secys))
+        if (list_empty(&rxd->secys)) {
                 netdev_rx_handler_unregister(real_dev);
+                kfree(rxd);
+        }
 
         macsec_del_dev(macsec);
 }
@@ -2945,8 +2959,10 @@ static int register_macsec_dev(struct net_device *real_dev,
 
                 err = netdev_rx_handler_register(real_dev, macsec_handle_frame,
                                                  rxd);
-                if (err < 0)
+                if (err < 0) {
+                        kfree(rxd);
                         return err;
+                }
         }
 
         list_add_tail_rcu(&macsec->secys, &rxd->secys);
@@ -3066,6 +3082,8 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
         if (err < 0)
                 goto del_dev;
 
+        macsec_generation++;
+
         dev_hold(real_dev);
 
         return 0;
@@ -3079,7 +3097,7 @@ unregister:
 
 static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[])
 {
-        u64 csid = DEFAULT_CIPHER_ID;
+        u64 csid = MACSEC_DEFAULT_CIPHER_ID;
         u8 icv_len = DEFAULT_ICV_LEN;
         int flag;
         bool es, scb, sci;
@@ -3094,8 +3112,8 @@ static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[])
                 icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]);
 
         switch (csid) {
-        case DEFAULT_CIPHER_ID:
-        case DEFAULT_CIPHER_ALT:
+        case MACSEC_DEFAULT_CIPHER_ID:
+        case MACSEC_DEFAULT_CIPHER_ALT:
                 if (icv_len < MACSEC_MIN_ICV_LEN ||
                     icv_len > MACSEC_MAX_ICV_LEN)
                         return -EINVAL;
@@ -3129,8 +3147,8 @@ static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[])
             nla_get_u8(data[IFLA_MACSEC_VALIDATION]) > MACSEC_VALIDATE_MAX)
                 return -EINVAL;
 
-        if ((data[IFLA_MACSEC_PROTECT] &&
-             nla_get_u8(data[IFLA_MACSEC_PROTECT])) &&
+        if ((data[IFLA_MACSEC_REPLAY_PROTECT] &&
+             nla_get_u8(data[IFLA_MACSEC_REPLAY_PROTECT])) &&
             !data[IFLA_MACSEC_WINDOW])
                 return -EINVAL;
 
@@ -3168,7 +3186,8 @@ static int macsec_fill_info(struct sk_buff *skb,
 
         if (nla_put_sci(skb, IFLA_MACSEC_SCI, secy->sci) ||
             nla_put_u8(skb, IFLA_MACSEC_ICV_LEN, secy->icv_len) ||
-            nla_put_u64(skb, IFLA_MACSEC_CIPHER_SUITE, DEFAULT_CIPHER_ID) ||
+            nla_put_u64(skb, IFLA_MACSEC_CIPHER_SUITE,
+                        MACSEC_DEFAULT_CIPHER_ID) ||
             nla_put_u8(skb, IFLA_MACSEC_ENCODING_SA, tx_sc->encoding_sa) ||
             nla_put_u8(skb, IFLA_MACSEC_ENCRYPT, tx_sc->encrypt) ||
             nla_put_u8(skb, IFLA_MACSEC_PROTECT, secy->protect_frames) ||
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index b3ffaee30858..f279a897a5c7 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -359,27 +359,25 @@ static void at803x_link_change_notify(struct phy_device *phydev)
          * in the FIFO. In such cases, the FIFO enters an error mode it
          * cannot recover from by software.
          */
-        if (phydev->drv->phy_id == ATH8030_PHY_ID) {
-                if (phydev->state == PHY_NOLINK) {
-                        if (priv->gpiod_reset && !priv->phy_reset) {
-                                struct at803x_context context;
-
-                                at803x_context_save(phydev, &context);
-
-                                gpiod_set_value(priv->gpiod_reset, 1);
-                                msleep(1);
-                                gpiod_set_value(priv->gpiod_reset, 0);
-                                msleep(1);
-
-                                at803x_context_restore(phydev, &context);
-
-                                phydev_dbg(phydev, "%s(): phy was reset\n",
-                                           __func__);
-                                priv->phy_reset = true;
-                        }
-                } else {
-                        priv->phy_reset = false;
+        if (phydev->state == PHY_NOLINK) {
+                if (priv->gpiod_reset && !priv->phy_reset) {
+                        struct at803x_context context;
+
+                        at803x_context_save(phydev, &context);
+
+                        gpiod_set_value(priv->gpiod_reset, 1);
+                        msleep(1);
+                        gpiod_set_value(priv->gpiod_reset, 0);
+                        msleep(1);
+
+                        at803x_context_restore(phydev, &context);
+
+                        phydev_dbg(phydev, "%s(): phy was reset\n",
+                                   __func__);
+                        priv->phy_reset = true;
                 }
+        } else {
+                priv->phy_reset = false;
         }
 }
 
@@ -391,7 +389,6 @@ static struct phy_driver at803x_driver[] = {
         .phy_id_mask            = 0xffffffef,
         .probe                  = at803x_probe,
         .config_init            = at803x_config_init,
-        .link_change_notify     = at803x_link_change_notify,
         .set_wol                = at803x_set_wol,
         .get_wol                = at803x_get_wol,
         .suspend                = at803x_suspend,
@@ -427,7 +424,6 @@ static struct phy_driver at803x_driver[] = {
         .phy_id_mask            = 0xffffffef,
         .probe                  = at803x_probe,
         .config_init            = at803x_config_init,
-        .link_change_notify     = at803x_link_change_notify,
         .set_wol                = at803x_set_wol,
         .get_wol                = at803x_get_wol,
         .suspend                = at803x_suspend,
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index f20890ee03f3..f64778ad9753 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -269,6 +269,7 @@ struct skb_data {		/* skb->cb is one of these */
         struct lan78xx_net *dev;
         enum skb_state state;
         size_t length;
+        int num_of_packet;
 };
 
 struct usb_context {
@@ -1803,7 +1804,34 @@ static void lan78xx_remove_mdio(struct lan78xx_net *dev)
 
 static void lan78xx_link_status_change(struct net_device *net)
 {
-        /* nothing to do */
+        struct phy_device *phydev = net->phydev;
+        int ret, temp;
+
+        /* At forced 100 F/H mode, chip may fail to set mode correctly
+         * when cable is switched between long(~50+m) and short one.
+         * As workaround, set to 10 before setting to 100
+         * at forced 100 F/H mode.
+         */
+        if (!phydev->autoneg && (phydev->speed == 100)) {
+                /* disable phy interrupt */
+                temp = phy_read(phydev, LAN88XX_INT_MASK);
+                temp &= ~LAN88XX_INT_MASK_MDINTPIN_EN_;
+                ret = phy_write(phydev, LAN88XX_INT_MASK, temp);
+
+                temp = phy_read(phydev, MII_BMCR);
+                temp &= ~(BMCR_SPEED100 | BMCR_SPEED1000);
+                phy_write(phydev, MII_BMCR, temp); /* set to 10 first */
+                temp |= BMCR_SPEED100;
+                phy_write(phydev, MII_BMCR, temp); /* set to 100 later */
+
+                /* clear pending interrupt generated while workaround */
+                temp = phy_read(phydev, LAN88XX_INT_STS);
+
+                /* enable phy interrupt back */
+                temp = phy_read(phydev, LAN88XX_INT_MASK);
+                temp |= LAN88XX_INT_MASK_MDINTPIN_EN_;
+                ret = phy_write(phydev, LAN88XX_INT_MASK, temp);
+        }
 }
 
 static int lan78xx_phy_init(struct lan78xx_net *dev)
@@ -2464,7 +2492,7 @@ static void tx_complete(struct urb *urb)
         struct lan78xx_net *dev = entry->dev;
 
         if (urb->status == 0) {
-                dev->net->stats.tx_packets++;
+                dev->net->stats.tx_packets += entry->num_of_packet;
                 dev->net->stats.tx_bytes += entry->length;
         } else {
                 dev->net->stats.tx_errors++;
@@ -2681,10 +2709,11 @@ void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb)
                 return;
         }
 
-        skb->protocol = eth_type_trans(skb, dev->net);
         dev->net->stats.rx_packets++;
         dev->net->stats.rx_bytes += skb->len;
 
+        skb->protocol = eth_type_trans(skb, dev->net);
+
         netif_dbg(dev, rx_status, dev->net, "< rx, len %zu, type 0x%x\n",
                   skb->len + sizeof(struct ethhdr), skb->protocol);
         memset(skb->cb, 0, sizeof(struct skb_data));
@@ -2934,13 +2963,16 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
 
         skb_totallen = 0;
         pkt_cnt = 0;
+        count = 0;
+        length = 0;
         for (skb = tqp->next; pkt_cnt < tqp->qlen; skb = skb->next) {
                 if (skb_is_gso(skb)) {
                         if (pkt_cnt) {
                                 /* handle previous packets first */
                                 break;
                         }
-                        length = skb->len;
+                        count = 1;
+                        length = skb->len - TX_OVERHEAD;
                         skb2 = skb_dequeue(tqp);
                         goto gso_skb;
                 }
@@ -2961,14 +2993,13 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
         for (count = pos = 0; count < pkt_cnt; count++) {
                 skb2 = skb_dequeue(tqp);
                 if (skb2) {
+                        length += (skb2->len - TX_OVERHEAD);
                         memcpy(skb->data + pos, skb2->data, skb2->len);
                         pos += roundup(skb2->len, sizeof(u32));
                         dev_kfree_skb(skb2);
                 }
         }
 
-        length = skb_totallen;
-
 gso_skb:
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
@@ -2980,6 +3011,7 @@ gso_skb:
         entry->urb = urb;
         entry->dev = dev;
         entry->length = length;
+        entry->num_of_packet = count;
 
         spin_lock_irqsave(&dev->txq.lock, flags);
         ret = usb_autopm_get_interface_async(dev->intf);
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index f84080215915..82129eef7774 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -411,7 +411,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
         int ret;
 
         read_mii_word(pegasus, pegasus->phy, MII_LPA, &linkpart);
-        data[0] = 0xc9;
+        data[0] = 0xc8; /* TX & RX enable, append status, no CRC */
         data[1] = 0;
         if (linkpart & (ADVERTISE_100FULL | ADVERTISE_10FULL))
                 data[1] |= 0x20;        /* set full duplex */
@@ -497,7 +497,7 @@ static void read_bulk_callback(struct urb *urb)
                 pkt_len = buf[count - 3] << 8;
                 pkt_len += buf[count - 4];
                 pkt_len &= 0xfff;
-                pkt_len -= 8;
+                pkt_len -= 4;
         }
 
         /*
@@ -528,7 +528,7 @@ static void read_bulk_callback(struct urb *urb)
 goon:
         usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
                           usb_rcvbulkpipe(pegasus->usb, 1),
-                          pegasus->rx_skb->data, PEGASUS_MTU + 8,
+                          pegasus->rx_skb->data, PEGASUS_MTU,
                           read_bulk_callback, pegasus);
         rx_status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC);
         if (rx_status == -ENODEV)
@@ -569,7 +569,7 @@ static void rx_fixup(unsigned long data)
         }
         usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
                           usb_rcvbulkpipe(pegasus->usb, 1),
-                          pegasus->rx_skb->data, PEGASUS_MTU + 8,
+                          pegasus->rx_skb->data, PEGASUS_MTU,
                           read_bulk_callback, pegasus);
 try_again:
         status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC);
@@ -823,7 +823,7 @@ static int pegasus_open(struct net_device *net)
 
         usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
                           usb_rcvbulkpipe(pegasus->usb, 1),
-                          pegasus->rx_skb->data, PEGASUS_MTU + 8,
+                          pegasus->rx_skb->data, PEGASUS_MTU,
                           read_bulk_callback, pegasus);
         if ((res = usb_submit_urb(pegasus->rx_urb, GFP_KERNEL))) {
                 if (res == -ENODEV)
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 30033dbe6662..c369db99c005 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -29,6 +29,7 @@
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
+#include <linux/of_net.h>
 #include "smsc75xx.h"
 
 #define SMSC_CHIPNAME                   "smsc75xx"
@@ -761,6 +762,15 @@ static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 
 static void smsc75xx_init_mac_address(struct usbnet *dev)
 {
+        const u8 *mac_addr;
+
+        /* maybe the boot loader passed the MAC address in devicetree */
+        mac_addr = of_get_mac_address(dev->udev->dev.of_node);
+        if (mac_addr) {
+                memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN);
+                return;
+        }
+
         /* try reading mac address from EEPROM */
         if (smsc75xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
                         dev->net->dev_addr) == 0) {
@@ -772,7 +782,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)
                 }
         }
 
-        /* no eeprom, or eeprom values are invalid. generate random MAC */
+        /* no useful static MAC address found. generate a random one */
         eth_hw_addr_random(dev->net);
         netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
 }
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 66b3ab9f614e..2edc2bc6d1b9 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -29,6 +29,7 @@
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
+#include <linux/of_net.h>
 #include "smsc95xx.h"
 
 #define SMSC_CHIPNAME                   "smsc95xx"
@@ -765,6 +766,15 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 
 static void smsc95xx_init_mac_address(struct usbnet *dev)
 {
+        const u8 *mac_addr;
+
+        /* maybe the boot loader passed the MAC address in devicetree */
+        mac_addr = of_get_mac_address(dev->udev->dev.of_node);
+        if (mac_addr) {
+                memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN);
+                return;
+        }
+
         /* try reading mac address from EEPROM */
         if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
                         dev->net->dev_addr) == 0) {
@@ -775,7 +785,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
                 }
         }
 
-        /* no eeprom, or eeprom values are invalid. generate random MAC */
+        /* no useful static MAC address found. generate a random one */
         eth_hw_addr_random(dev->net);
         netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 8f8793004b9f..1b271b99c49e 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -274,6 +274,9 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
         };
         static const int inc[4] = { 0, 100, 0, 0 };
 
+        memset(&mask_m, 0, sizeof(int8_t) * 123);
+        memset(&mask_p, 0, sizeof(int8_t) * 123);
+
         cur_bin = -6000;
         upper = bin + 100;
         lower = bin - 100;
@@ -424,14 +427,9 @@ static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
         int tmp, new;
         int i;
 
-        int8_t mask_m[123];
-        int8_t mask_p[123];
         int cur_bb_spur;
         bool is2GHz = IS_CHAN_2GHZ(chan);
 
-        memset(&mask_m, 0, sizeof(int8_t) * 123);
-        memset(&mask_p, 0, sizeof(int8_t) * 123);
-
         for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
                 cur_bb_spur = ah->eep_ops->get_spur_channel(ah, i, is2GHz);
                 if (AR_NO_SPUR == cur_bb_spur)
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index db6624527d99..53d7445a5d12 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -178,14 +178,9 @@ static void ar9002_hw_spur_mitigate(struct ath_hw *ah,
         int i;
         struct chan_centers centers;
 
-        int8_t mask_m[123];
-        int8_t mask_p[123];
         int cur_bb_spur;
         bool is2GHz = IS_CHAN_2GHZ(chan);
 
-        memset(&mask_m, 0, sizeof(int8_t) * 123);
-        memset(&mask_p, 0, sizeof(int8_t) * 123);
-
         ath9k_hw_get_channel_centers(ah, chan, &centers);
         freq = centers.synth_center;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 97be104d1203..b5c57eebf995 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -93,7 +93,7 @@
 #define IWL8260_SMEM_OFFSET             0x400000
 #define IWL8260_SMEM_LEN                0x68000
 
-#define IWL8000_FW_PRE "iwlwifi-8000"
+#define IWL8000_FW_PRE "iwlwifi-8000C-"
 #define IWL8000_MODULE_FIRMWARE(api) \
         IWL8000_FW_PRE "-" __stringify(api) ".ucode"
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index f899666acb41..9e45bf9c6071 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -238,19 +238,6 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
         snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
                  name_pre, tag);
 
-        /*
-         * Starting 8000B - FW name format has changed. This overwrites the
-         * previous name and uses the new format.
-         */
-        if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
-                char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev);
-
-                if (rev_step != 'A')
-                        snprintf(drv->firmware_name,
-                                 sizeof(drv->firmware_name), "%s%c-%s.ucode",
-                                 name_pre, rev_step, tag);
-        }
-
         IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",
                        (drv->fw_index == UCODE_EXPERIMENTAL_INDEX)
                                 ? "EXPERIMENTAL " : "",
@@ -1060,11 +1047,18 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                 return -EINVAL;
         }
 
-        if (WARN(fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&
-                 !gscan_capa,
-                 "GSCAN is supported but capabilities TLV is unavailable\n"))
+        /*
+         * If ucode advertises that it supports GSCAN but GSCAN
+         * capabilities TLV is not present, or if it has an old format,
+         * warn and continue without GSCAN.
+         */
+        if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&
+            !gscan_capa) {
+                IWL_DEBUG_INFO(drv,
+                               "GSCAN is supported but capabilities TLV is unavailable\n");
                 __clear_bit((__force long)IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT,
                             capa->_capa);
+        }
 
         return 0;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
index 4856eac120f6..6938cd37be57 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
@@ -526,7 +526,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
                 file_len += sizeof(*dump_data) + sizeof(*dump_mem) + sram2_len;
 
         /* Make room for fw's virtual image pages, if it exists */
-        if (mvm->fw->img[mvm->cur_ucode].paging_mem_size)
+        if (mvm->fw->img[mvm->cur_ucode].paging_mem_size &&
+            mvm->fw_paging_db[0].fw_paging_block)
                 file_len += mvm->num_of_paging_blk *
                         (sizeof(*dump_data) +
                          sizeof(struct iwl_fw_error_dump_paging) +
@@ -643,7 +644,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
         }
 
         /* Dump fw's virtual image */
-        if (mvm->fw->img[mvm->cur_ucode].paging_mem_size) {
+        if (mvm->fw->img[mvm->cur_ucode].paging_mem_size &&
+            mvm->fw_paging_db[0].fw_paging_block) {
                 for (i = 1; i < mvm->num_of_paging_blk + 1; i++) {
                         struct iwl_fw_error_dump_paging *paging;
                         struct page *pages =
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 594cd0dc7df9..09d895fafaf2 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -144,9 +144,11 @@ void iwl_free_fw_paging(struct iwl_mvm *mvm)
 
                 __free_pages(mvm->fw_paging_db[i].fw_paging_block,
                              get_order(mvm->fw_paging_db[i].fw_paging_size));
+                mvm->fw_paging_db[i].fw_paging_block = NULL;
         }
         kfree(mvm->trans->paging_download_buf);
         mvm->trans->paging_download_buf = NULL;
+        mvm->trans->paging_db = NULL;
 
         memset(mvm->fw_paging_db, 0, sizeof(mvm->fw_paging_db));
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 05b968506836..79d7cd7d461e 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -479,8 +479,18 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x24F3, 0x0000, iwl8265_2ac_cfg)},
         {IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x0110, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x1110, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x1010, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x0050, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x0150, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x9010, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x8110, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x8050, iwl8265_2ac_cfg)},
         {IWL_PCI_DEVICE(0x24FD, 0x8010, iwl8265_2ac_cfg)},
         {IWL_PCI_DEVICE(0x24FD, 0x0810, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x9110, iwl8265_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x24FD, 0x8130, iwl8265_2ac_cfg)},
 
 /* 9000 Series */
         {IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl5165_2ac_cfg)},