42 files changed, 357 insertions, 120 deletions

diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index b2f10b6ad6e5..bbb2575d4728 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -1455,7 +1455,7 @@ static void __exit cfhsi_exit_module(void)
         rtnl_lock();
         list_for_each_safe(list_node, n, &cfhsi_list) {
                 cfhsi = list_entry(list_node, struct cfhsi, list);
-                unregister_netdev(cfhsi->ndev);
+                unregister_netdevice(cfhsi->ndev);
         }
         rtnl_unlock();
 }
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index 72a57c6cd254..8b69d0d7e726 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -35,6 +35,7 @@
 #include <linux/regmap.h>
 #include <linux/reset.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
 /* For our NAPI weight bigger does *NOT* mean better - it means more
  * D-cache misses and lots more wasted cycles than we'll ever
@@ -1724,17 +1725,19 @@ static int ag71xx_probe(struct platform_device *pdev)
         ag->stop_desc = dmam_alloc_coherent(&pdev->dev,
                                             sizeof(struct ag71xx_desc),
                                             &ag->stop_desc_dma, GFP_KERNEL);
-        if (!ag->stop_desc)
+        if (!ag->stop_desc) {
+                err = -ENOMEM;
                 goto err_free;
+        }
 
         ag->stop_desc->data = 0;
         ag->stop_desc->ctrl = 0;
         ag->stop_desc->next = (u32)ag->stop_desc_dma;
 
         mac_addr = of_get_mac_address(np);
-        if (mac_addr)
+        if (!IS_ERR(mac_addr))
                 memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);
-        if (!mac_addr || !is_valid_ether_addr(ndev->dev_addr)) {
+        if (IS_ERR(mac_addr) || !is_valid_ether_addr(ndev->dev_addr)) {
                 netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");
                 eth_random_addr(ndev->dev_addr);
         }
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 7c767ce9aafa..b5c6dc914720 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -1060,8 +1060,6 @@ static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
                 goto err_nomem;
         }
 
-        memset(ring_header->desc, 0, ring_header->size);
-
         /* init TPD ring */
         tpd_ring->dma = ring_header->dma;
         offset = (tpd_ring->dma & 0x7) ? (8 - (ring_header->dma & 0x7)) : 0;
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 3a3fb5ce0fee..3aba38322717 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -291,7 +291,6 @@ static s32 atl2_setup_ring_resources(struct atl2_adapter *adapter)
                 &adapter->ring_dma);
         if (!adapter->ring_vir_addr)
                 return -ENOMEM;
-        memset(adapter->ring_vir_addr, 0, adapter->ring_size);
 
         /* Init TXD Ring */
         adapter->txd_dma = adapter->ring_dma ;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 3f632028eff0..7134d2c3eb1c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2677,8 +2677,6 @@ static int bnxt_alloc_tx_rings(struct bnxt *bp)
                         mapping = txr->tx_push_mapping +
                                 sizeof(struct tx_push_bd);
                         txr->data_mapping = cpu_to_le64(mapping);
-
-                        memset(txr->tx_push, 0, sizeof(struct tx_push_bd));
                 }
                 qidx = bp->tc_to_qidx[j];
                 ring->queue_id = bp->q_info[qidx].queue_id;
@@ -3077,7 +3075,7 @@ static int bnxt_alloc_vnics(struct bnxt *bp)
         int num_vnics = 1;
 
 #ifdef CONFIG_RFS_ACCEL
-        if (bp->flags & BNXT_FLAG_RFS)
+        if ((bp->flags & (BNXT_FLAG_RFS | BNXT_FLAG_CHIP_P5)) == BNXT_FLAG_RFS)
                 num_vnics += bp->rx_nr_rings;
 #endif
 
@@ -7188,6 +7186,9 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp)
 #ifdef CONFIG_RFS_ACCEL
         int i, rc = 0;
 
+        if (bp->flags & BNXT_FLAG_CHIP_P5)
+                return 0;
+
         for (i = 0; i < bp->rx_nr_rings; i++) {
                 struct bnxt_vnic_info *vnic;
                 u16 vnic_id = i + 1;
@@ -9647,7 +9648,7 @@ int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,
                 return -ENOMEM;
 
         vnics = 1;
-        if (bp->flags & BNXT_FLAG_RFS)
+        if ((bp->flags & (BNXT_FLAG_RFS | BNXT_FLAG_CHIP_P5)) == BNXT_FLAG_RFS)
                 vnics += rx_rings;
 
         if (bp->flags & BNXT_FLAG_AGG_RINGS)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 34466b827dde..a2b57807453b 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3083,39 +3083,42 @@ static void bcmgenet_timeout(struct net_device *dev)
         netif_tx_wake_all_queues(dev);
 }
 
-#define MAX_MC_COUNT    16
+#define MAX_MDF_FILTER  17
 
 static inline void bcmgenet_set_mdf_addr(struct bcmgenet_priv *priv,
                                          unsigned char *addr,
-                                         int *i,
-                                         int *mc)
+                                         int *i)
 {
-        u32 reg;
-
         bcmgenet_umac_writel(priv, addr[0] << 8 | addr[1],
                              UMAC_MDF_ADDR + (*i * 4));
         bcmgenet_umac_writel(priv, addr[2] << 24 | addr[3] << 16 |
                              addr[4] << 8 | addr[5],
                              UMAC_MDF_ADDR + ((*i + 1) * 4));
-        reg = bcmgenet_umac_readl(priv, UMAC_MDF_CTRL);
-        reg |= (1 << (MAX_MC_COUNT - *mc));
-        bcmgenet_umac_writel(priv, reg, UMAC_MDF_CTRL);
         *i += 2;
-        (*mc)++;
 }
 
 static void bcmgenet_set_rx_mode(struct net_device *dev)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
         struct netdev_hw_addr *ha;
-        int i, mc;
+        int i, nfilter;
         u32 reg;
 
         netif_dbg(priv, hw, dev, "%s: %08X\n", __func__, dev->flags);
 
-        /* Promiscuous mode */
+        /* Number of filters needed */
+        nfilter = netdev_uc_count(dev) + netdev_mc_count(dev) + 2;
+
+        /*
+         * Turn on promicuous mode for three scenarios
+         * 1. IFF_PROMISC flag is set
+         * 2. IFF_ALLMULTI flag is set
+         * 3. The number of filters needed exceeds the number filters
+         *    supported by the hardware.
+        */
         reg = bcmgenet_umac_readl(priv, UMAC_CMD);
-        if (dev->flags & IFF_PROMISC) {
+        if ((dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) ||
+            (nfilter > MAX_MDF_FILTER)) {
                 reg |= CMD_PROMISC;
                 bcmgenet_umac_writel(priv, reg, UMAC_CMD);
                 bcmgenet_umac_writel(priv, 0, UMAC_MDF_CTRL);
@@ -3125,32 +3128,24 @@ static void bcmgenet_set_rx_mode(struct net_device *dev)
                 bcmgenet_umac_writel(priv, reg, UMAC_CMD);
         }
 
-        /* UniMac doesn't support ALLMULTI */
-        if (dev->flags & IFF_ALLMULTI) {
-                netdev_warn(dev, "ALLMULTI is not supported\n");
-                return;
-        }
-
         /* update MDF filter */
         i = 0;
-        mc = 0;
         /* Broadcast */
-        bcmgenet_set_mdf_addr(priv, dev->broadcast, &i, &mc);
+        bcmgenet_set_mdf_addr(priv, dev->broadcast, &i);
         /* my own address.*/
-        bcmgenet_set_mdf_addr(priv, dev->dev_addr, &i, &mc);
-        /* Unicast list*/
-        if (netdev_uc_count(dev) > (MAX_MC_COUNT - mc))
-                return;
+        bcmgenet_set_mdf_addr(priv, dev->dev_addr, &i);
 
-        if (!netdev_uc_empty(dev))
-                netdev_for_each_uc_addr(ha, dev)
-                        bcmgenet_set_mdf_addr(priv, ha->addr, &i, &mc);
-        /* Multicast */
-        if (netdev_mc_empty(dev) || netdev_mc_count(dev) >= (MAX_MC_COUNT - mc))
-                return;
+        /* Unicast */
+        netdev_for_each_uc_addr(ha, dev)
+                bcmgenet_set_mdf_addr(priv, ha->addr, &i);
 
+        /* Multicast */
         netdev_for_each_mc_addr(ha, dev)
-                bcmgenet_set_mdf_addr(priv, ha->addr, &i, &mc);
+                bcmgenet_set_mdf_addr(priv, ha->addr, &i);
+
+        /* Enable filters */
+        reg = GENMASK(MAX_MDF_FILTER - 1, MAX_MDF_FILTER - nfilter);
+        bcmgenet_umac_writel(priv, reg, UMAC_MDF_CTRL);
 }
 
 /* Set the hardware MAC address. */
diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c
index fcf20a8f92d9..032224178b64 100644
--- a/drivers/net/ethernet/cavium/liquidio/request_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c
@@ -218,15 +218,13 @@ int octeon_setup_iq(struct octeon_device *oct,
                 return 0;
         }
         oct->instr_queue[iq_no] =
-            vmalloc_node(sizeof(struct octeon_instr_queue), numa_node);
+            vzalloc_node(sizeof(struct octeon_instr_queue), numa_node);
         if (!oct->instr_queue[iq_no])
                 oct->instr_queue[iq_no] =
-                    vmalloc(sizeof(struct octeon_instr_queue));
+                    vzalloc(sizeof(struct octeon_instr_queue));
         if (!oct->instr_queue[iq_no])
                 return 1;
 
-        memset(oct->instr_queue[iq_no], 0,
-               sizeof(struct octeon_instr_queue));
 
         oct->instr_queue[iq_no]->q_index = q_index;
         oct->instr_queue[iq_no]->app_ctx = app_ctx;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sched.c b/drivers/net/ethernet/chelsio/cxgb4/sched.c
index ba6c153ee45c..60218dc676a8 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sched.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sched.c
@@ -207,7 +207,6 @@ static int t4_sched_queue_bind(struct port_info *pi, struct ch_sched_queue *p)
                 goto out_err;
 
         /* Bind queue to specified class */
-        memset(qe, 0, sizeof(*qe));
         qe->cntxt_id = qid;
         memcpy(&qe->param, p, sizeof(qe->param));
 
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 82015c8a5ed7..b7a246b33599 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4697,8 +4697,12 @@ int be_update_queues(struct be_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         int status;
 
-        if (netif_running(netdev))
+        if (netif_running(netdev)) {
+                /* device cannot transmit now, avoid dev_watchdog timeouts */
+                netif_carrier_off(netdev);
+
                 be_close(netdev);
+        }
 
         be_cancel_worker(adapter);
 
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 9d459ccf251d..e5610a4da539 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3144,8 +3144,6 @@ static int fec_enet_init(struct net_device *ndev)
                 return -ENOMEM;
         }
 
-        memset(cbd_base, 0, bd_size);
-
         /* Get the Ethernet address */
         fec_get_mac(ndev);
         /* make sure MAC we just acquired is programmed into the hw */
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 24f16e3368cd..497298752381 100644
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -232,7 +232,7 @@ abort_with_mgmt_vector:
 abort_with_msix_enabled:
         pci_disable_msix(priv->pdev);
 abort_with_msix_vectors:
-        kfree(priv->msix_vectors);
+        kvfree(priv->msix_vectors);
         priv->msix_vectors = NULL;
         return err;
 }
@@ -256,7 +256,7 @@ static void gve_free_notify_blocks(struct gve_priv *priv)
         priv->ntfy_blocks = NULL;
         free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv);
         pci_disable_msix(priv->pdev);
-        kfree(priv->msix_vectors);
+        kvfree(priv->msix_vectors);
         priv->msix_vectors = NULL;
 }
 
@@ -445,12 +445,12 @@ static int gve_alloc_rings(struct gve_priv *priv)
         return 0;
 
 free_rx:
-        kfree(priv->rx);
+        kvfree(priv->rx);
         priv->rx = NULL;
 free_tx_queue:
         gve_tx_free_rings(priv);
 free_tx:
-        kfree(priv->tx);
+        kvfree(priv->tx);
         priv->tx = NULL;
         return err;
 }
@@ -500,7 +500,7 @@ static void gve_free_rings(struct gve_priv *priv)
                         gve_remove_napi(priv, ntfy_idx);
                 }
                 gve_tx_free_rings(priv);
-                kfree(priv->tx);
+                kvfree(priv->tx);
                 priv->tx = NULL;
         }
         if (priv->rx) {
@@ -509,7 +509,7 @@ static void gve_free_rings(struct gve_priv *priv)
                         gve_remove_napi(priv, ntfy_idx);
                 }
                 gve_rx_free_rings(priv);
-                kfree(priv->rx);
+                kvfree(priv->rx);
                 priv->rx = NULL;
         }
 }
@@ -592,9 +592,9 @@ static void gve_free_queue_page_list(struct gve_priv *priv,
                 gve_free_page(&priv->pdev->dev, qpl->pages[i],
                               qpl->page_buses[i], gve_qpl_dma_dir(priv, id));
 
-        kfree(qpl->page_buses);
+        kvfree(qpl->page_buses);
 free_pages:
-        kfree(qpl->pages);
+        kvfree(qpl->pages);
         priv->num_registered_pages -= qpl->num_entries;
 }
 
@@ -635,7 +635,7 @@ static int gve_alloc_qpls(struct gve_priv *priv)
 free_qpls:
         for (j = 0; j <= i; j++)
                 gve_free_queue_page_list(priv, j);
-        kfree(priv->qpls);
+        kvfree(priv->qpls);
         return err;
 }
 
@@ -644,12 +644,12 @@ static void gve_free_qpls(struct gve_priv *priv)
         int num_qpls = gve_num_tx_qpls(priv) + gve_num_rx_qpls(priv);
         int i;
 
-        kfree(priv->qpl_cfg.qpl_id_map);
+        kvfree(priv->qpl_cfg.qpl_id_map);
 
         for (i = 0; i < num_qpls; i++)
                 gve_free_queue_page_list(priv, i);
 
-        kfree(priv->qpls);
+        kvfree(priv->qpls);
 }
 
 /* Use this to schedule a reset when the device is capable of continuing
@@ -1192,7 +1192,6 @@ abort_with_enabled:
         pci_disable_device(pdev);
         return -ENXIO;
 }
-EXPORT_SYMBOL(gve_probe);
 
 static void gve_remove(struct pci_dev *pdev)
 {
diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c
index c1aeabd1c594..1914b8350da7 100644
--- a/drivers/net/ethernet/google/gve/gve_rx.c
+++ b/drivers/net/ethernet/google/gve/gve_rx.c
@@ -35,7 +35,7 @@ static void gve_rx_free_ring(struct gve_priv *priv, int idx)
 
         gve_unassign_qpl(priv, rx->data.qpl->id);
         rx->data.qpl = NULL;
-        kfree(rx->data.page_info);
+        kvfree(rx->data.page_info);
 
         slots = rx->data.mask + 1;
         bytes = sizeof(*rx->data.data_ring) * slots;
@@ -168,7 +168,7 @@ abort_with_q_resources:
                           rx->q_resources, rx->q_resources_bus);
         rx->q_resources = NULL;
 abort_filled:
-        kfree(rx->data.page_info);
+        kvfree(rx->data.page_info);
 abort_with_slots:
         bytes = sizeof(*rx->data.data_ring) * slots;
         dma_free_coherent(hdev, bytes, rx->data.data_ring, rx->data.data_bus);
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 76b7b7b85e35..0b668357db4d 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -582,11 +582,6 @@ jme_setup_tx_resources(struct jme_adapter *jme)
         if (unlikely(!(txring->bufinf)))
                 goto err_free_txring;
 
-        /*
-         * Initialize Transmit Descriptors
-         */
-        memset(txring->alloc, 0, TX_RING_ALLOC_SIZE(jme->tx_ring_size));
-
         return 0;
 
 err_free_txring:
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 35a92fd2cf39..9ac854c2b371 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -2558,8 +2558,6 @@ static int skge_up(struct net_device *dev)
                 goto free_pci_mem;
         }
 
-        memset(skge->mem, 0, skge->mem_size);
-
         err = skge_ring_alloc(&skge->rx_ring, skge->mem, skge->dma);
         if (err)
                 goto free_pci_mem;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index fe518c854d1f..f518312ffe69 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4917,6 +4917,13 @@ static const struct dmi_system_id msi_blacklist[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "P-79"),
                 },
         },
+        {
+                .ident = "ASUS P5W DH Deluxe",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTEK COMPUTER INC"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "P5W DH Deluxe"),
+                },
+        },
         {}
 };
 
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index b20b3a5a1ebb..c39d7f4ab1d4 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2548,8 +2548,10 @@ static int mtk_probe(struct platform_device *pdev)
                         continue;
 
                 err = mtk_add_mac(eth, mac_np);
-                if (err)
+                if (err) {
+                        of_node_put(mac_np);
                         goto err_deinit_hw;
+                }
         }
 
         if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT)) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index a5be27772b8e..c790a5fcea73 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -1013,8 +1013,6 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent,
 
                 dma_list[i] = t;
                 eq->page_list[i].map = t;
-
-                memset(eq->page_list[i].buf, 0, PAGE_SIZE);
         }
 
         eq->eqn = mlx4_bitmap_alloc(&priv->eq_table.bitmap);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 2d6436257f9d..cc096f6011d9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1499,7 +1499,8 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
         *match_level = MLX5_MATCH_NONE;
 
         if (dissector->used_keys &
-            ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |
+            ~(BIT(FLOW_DISSECTOR_KEY_META) |
+              BIT(FLOW_DISSECTOR_KEY_CONTROL) |
               BIT(FLOW_DISSECTOR_KEY_BASIC) |
               BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |
               BIT(FLOW_DISSECTOR_KEY_VLAN) |
@@ -1522,11 +1523,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
                 return -EOPNOTSUPP;
         }
 
-        if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) ||
-            flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) ||
-            flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID) ||
-            flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_PORTS) ||
-            flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_OPTS)) {
+        if (mlx5e_get_tc_tun(filter_dev)) {
                 if (parse_tunnel_attr(priv, spec, f, filter_dev, tunnel_match_level))
                         return -EOPNOTSUPP;
 
@@ -2647,6 +2644,10 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv,
         family = ip_tunnel_info_af(tun_info);
         key.ip_tun_key = &tun_info->key;
         key.tc_tunnel = mlx5e_get_tc_tun(mirred_dev);
+        if (!key.tc_tunnel) {
+                NL_SET_ERR_MSG_MOD(extack, "Unsupported tunnel");
+                return -EOPNOTSUPP;
+        }
 
         hash_key = hash_encap_info(&key);
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 3b04d8927fb1..1f3891fde2eb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -2450,7 +2450,6 @@ int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw,
         MLX5_SET(query_vport_counter_in, in, vport_number, vport->vport);
         MLX5_SET(query_vport_counter_in, in, other_vport, 1);
 
-        memset(out, 0, outlen);
         err = mlx5_cmd_exec(esw->dev, in, sizeof(in), out, outlen);
         if (err)
                 goto free_out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 957d9b09dc3f..089ae4d48a82 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1134,7 +1134,6 @@ static int esw_create_offloads_fdb_tables(struct mlx5_eswitch *esw, int nvports)
         }
 
         /* create send-to-vport group */
-        memset(flow_group_in, 0, inlen);
         MLX5_SET(create_flow_group_in, flow_group_in, match_criteria_enable,
                  MLX5_MATCH_MISC_PARAMETERS);
 
@@ -1293,8 +1292,6 @@ static int esw_create_vport_rx_group(struct mlx5_eswitch *esw, int nvports)
                 return -ENOMEM;
 
         /* create vport rx group */
-        memset(flow_group_in, 0, inlen);
-
         esw_set_flow_group_source_port(esw, flow_group_in);
 
         MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 0);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 2fe6923f7ce0..9314777d99e3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -597,7 +597,7 @@ mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,
         err = devlink_fmsg_arr_pair_nest_end(fmsg);
 
 free_data:
-        kfree(cr_data);
+        kvfree(cr_data);
         return err;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 051b19388a81..615455a21567 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -847,7 +847,6 @@ static int mlxsw_pci_queue_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
                                              &mem_item->mapaddr);
         if (!mem_item->buf)
                 return -ENOMEM;
-        memset(mem_item->buf, 0, mem_item->size);
 
         q->elem_info = kcalloc(q->count, sizeof(*q->elem_info), GFP_KERNEL);
         if (!q->elem_info) {
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index a252b080dda9..131f62ce9297 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -830,6 +830,7 @@ int mlxsw_sp_setup_tc_prio(struct mlxsw_sp_port *mlxsw_sp_port,
                            struct tc_prio_qopt_offload *p);
 
 /* spectrum_fid.c */
+bool mlxsw_sp_fid_is_dummy(struct mlxsw_sp *mlxsw_sp, u16 fid_index);
 bool mlxsw_sp_fid_lag_vid_valid(const struct mlxsw_sp_fid *fid);
 struct mlxsw_sp_fid *mlxsw_sp_fid_lookup_by_index(struct mlxsw_sp *mlxsw_sp,
                                                   u16 fid_index);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
index b25048c6c761..21296fa7f7fb 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
@@ -408,14 +408,6 @@ static int mlxsw_sp_port_dcb_app_update(struct mlxsw_sp_port *mlxsw_sp_port)
         have_dscp = mlxsw_sp_port_dcb_app_prio_dscp_map(mlxsw_sp_port,
                                                         &prio_map);
 
-        if (!have_dscp) {
-                err = mlxsw_sp_port_dcb_toggle_trust(mlxsw_sp_port,
-                                        MLXSW_REG_QPTS_TRUST_STATE_PCP);
-                if (err)
-                        netdev_err(mlxsw_sp_port->dev, "Couldn't switch to trust L2\n");
-                return err;
-        }
-
         mlxsw_sp_port_dcb_app_dscp_prio_map(mlxsw_sp_port, default_prio,
                                             &dscp_map);
         err = mlxsw_sp_port_dcb_app_update_qpdpm(mlxsw_sp_port,
@@ -432,6 +424,14 @@ static int mlxsw_sp_port_dcb_app_update(struct mlxsw_sp_port *mlxsw_sp_port)
                 return err;
         }
 
+        if (!have_dscp) {
+                err = mlxsw_sp_port_dcb_toggle_trust(mlxsw_sp_port,
+                                        MLXSW_REG_QPTS_TRUST_STATE_PCP);
+                if (err)
+                        netdev_err(mlxsw_sp_port->dev, "Couldn't switch to trust L2\n");
+                return err;
+        }
+
         err = mlxsw_sp_port_dcb_toggle_trust(mlxsw_sp_port,
                                              MLXSW_REG_QPTS_TRUST_STATE_DSCP);
         if (err) {
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
index 46baf3b44309..8df3cb21baa6 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
@@ -126,6 +126,16 @@ static const int *mlxsw_sp_packet_type_sfgc_types[] = {
         [MLXSW_SP_FLOOD_TYPE_MC]        = mlxsw_sp_sfgc_mc_packet_types,
 };
 
+bool mlxsw_sp_fid_is_dummy(struct mlxsw_sp *mlxsw_sp, u16 fid_index)
+{
+        enum mlxsw_sp_fid_type fid_type = MLXSW_SP_FID_TYPE_DUMMY;
+        struct mlxsw_sp_fid_family *fid_family;
+
+        fid_family = mlxsw_sp->fid_core->fid_family_arr[fid_type];
+
+        return fid_family->start_index == fid_index;
+}
+
 bool mlxsw_sp_fid_lag_vid_valid(const struct mlxsw_sp_fid *fid)
 {
         return fid->fid_family->lag_vid_valid;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 50111f228d77..5ecb45118400 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2468,6 +2468,9 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp,
                 goto just_remove;
         }
 
+        if (mlxsw_sp_fid_is_dummy(mlxsw_sp, fid))
+                goto just_remove;
+
         mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_fid(mlxsw_sp_port, fid);
         if (!mlxsw_sp_port_vlan) {
                 netdev_err(mlxsw_sp_port->dev, "Failed to find a matching {Port, VID} following FDB notification\n");
@@ -2527,6 +2530,9 @@ static void mlxsw_sp_fdb_notify_mac_lag_process(struct mlxsw_sp *mlxsw_sp,
                 goto just_remove;
         }
 
+        if (mlxsw_sp_fid_is_dummy(mlxsw_sp, fid))
+                goto just_remove;
+
         mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_fid(mlxsw_sp_port, fid);
         if (!mlxsw_sp_port_vlan) {
                 netdev_err(mlxsw_sp_port->dev, "Failed to find a matching {Port, VID} following FDB notification\n");
diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
index 58bde1a9eacb..2451d4a96490 100644
--- a/drivers/net/ethernet/mscc/ocelot_board.c
+++ b/drivers/net/ethernet/mscc/ocelot_board.c
@@ -291,8 +291,10 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
                         continue;
 
                 err = ocelot_probe_port(ocelot, port, regs, phy);
-                if (err)
+                if (err) {
+                        of_node_put(portnp);
                         return err;
+                }
 
                 phy_mode = of_get_phy_mode(portnp);
                 if (phy_mode < 0)
@@ -318,6 +320,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
                         dev_err(ocelot->dev,
                                 "invalid phy mode for port%d, (Q)SGMII only\n",
                                 port);
+                        of_node_put(portnp);
                         return -EINVAL;
                 }
 
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 3b2ae1a21678..e0b2bf327905 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -747,7 +747,6 @@ static int init_shared_mem(struct s2io_nic *nic)
                                 return -ENOMEM;
                         }
                         mem_allocated += size;
-                        memset(tmp_v_addr, 0, size);
 
                         size = sizeof(struct rxd_info) *
                                 rxd_count[nic->rxd_mode];
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 433052f734ed..5e9f8ee99800 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -442,10 +442,8 @@ nx_fw_cmd_create_tx_ctx(struct netxen_adapter *adapter)
                 goto out_free_rq;
         }
 
-        memset(rq_addr, 0, rq_size);
         prq = rq_addr;
 
-        memset(rsp_addr, 0, rsp_size);
         prsp = rsp_addr;
 
         prq->host_rsp_dma_addr = cpu_to_le64(rsp_phys_addr);
@@ -755,7 +753,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
                 return -ENOMEM;
         }
 
-        memset(addr, 0, sizeof(struct netxen_ring_ctx));
         recv_ctx->hwctx = addr;
         recv_ctx->hwctx->ctx_id = cpu_to_le32(port);
         recv_ctx->hwctx->cmd_consumer_offset =
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index efef5453b94f..0637c6752a78 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4667,6 +4667,143 @@ static void rtl_hw_start_8411_2(struct rtl8169_private *tp)
         /* disable aspm and clock request before access ephy */
         rtl_hw_aspm_clkreq_enable(tp, false);
         rtl_ephy_init(tp, e_info_8411_2);
+
+        /* The following Realtek-provided magic fixes an issue with the RX unit
+         * getting confused after the PHY having been powered-down.
+         */
+        r8168_mac_ocp_write(tp, 0xFC28, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC2A, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC2C, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC2E, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC30, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC32, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC34, 0x0000);
+        r8168_mac_ocp_write(tp, 0xFC36, 0x0000);
+        mdelay(3);
+        r8168_mac_ocp_write(tp, 0xFC26, 0x0000);
+
+        r8168_mac_ocp_write(tp, 0xF800, 0xE008);
+        r8168_mac_ocp_write(tp, 0xF802, 0xE00A);
+        r8168_mac_ocp_write(tp, 0xF804, 0xE00C);
+        r8168_mac_ocp_write(tp, 0xF806, 0xE00E);
+        r8168_mac_ocp_write(tp, 0xF808, 0xE027);
+        r8168_mac_ocp_write(tp, 0xF80A, 0xE04F);
+        r8168_mac_ocp_write(tp, 0xF80C, 0xE05E);
+        r8168_mac_ocp_write(tp, 0xF80E, 0xE065);
+        r8168_mac_ocp_write(tp, 0xF810, 0xC602);
+        r8168_mac_ocp_write(tp, 0xF812, 0xBE00);
+        r8168_mac_ocp_write(tp, 0xF814, 0x0000);
+        r8168_mac_ocp_write(tp, 0xF816, 0xC502);
+        r8168_mac_ocp_write(tp, 0xF818, 0xBD00);
+        r8168_mac_ocp_write(tp, 0xF81A, 0x074C);
+        r8168_mac_ocp_write(tp, 0xF81C, 0xC302);
+        r8168_mac_ocp_write(tp, 0xF81E, 0xBB00);
+        r8168_mac_ocp_write(tp, 0xF820, 0x080A);
+        r8168_mac_ocp_write(tp, 0xF822, 0x6420);
+        r8168_mac_ocp_write(tp, 0xF824, 0x48C2);
+        r8168_mac_ocp_write(tp, 0xF826, 0x8C20);
+        r8168_mac_ocp_write(tp, 0xF828, 0xC516);
+        r8168_mac_ocp_write(tp, 0xF82A, 0x64A4);
+        r8168_mac_ocp_write(tp, 0xF82C, 0x49C0);
+        r8168_mac_ocp_write(tp, 0xF82E, 0xF009);
+        r8168_mac_ocp_write(tp, 0xF830, 0x74A2);
+        r8168_mac_ocp_write(tp, 0xF832, 0x8CA5);
+        r8168_mac_ocp_write(tp, 0xF834, 0x74A0);
+        r8168_mac_ocp_write(tp, 0xF836, 0xC50E);
+        r8168_mac_ocp_write(tp, 0xF838, 0x9CA2);
+        r8168_mac_ocp_write(tp, 0xF83A, 0x1C11);
+        r8168_mac_ocp_write(tp, 0xF83C, 0x9CA0);
+        r8168_mac_ocp_write(tp, 0xF83E, 0xE006);
+        r8168_mac_ocp_write(tp, 0xF840, 0x74F8);
+        r8168_mac_ocp_write(tp, 0xF842, 0x48C4);
+        r8168_mac_ocp_write(tp, 0xF844, 0x8CF8);
+        r8168_mac_ocp_write(tp, 0xF846, 0xC404);
+        r8168_mac_ocp_write(tp, 0xF848, 0xBC00);
+        r8168_mac_ocp_write(tp, 0xF84A, 0xC403);
+        r8168_mac_ocp_write(tp, 0xF84C, 0xBC00);
+        r8168_mac_ocp_write(tp, 0xF84E, 0x0BF2);
+        r8168_mac_ocp_write(tp, 0xF850, 0x0C0A);
+        r8168_mac_ocp_write(tp, 0xF852, 0xE434);
+        r8168_mac_ocp_write(tp, 0xF854, 0xD3C0);
+        r8168_mac_ocp_write(tp, 0xF856, 0x49D9);
+        r8168_mac_ocp_write(tp, 0xF858, 0xF01F);
+        r8168_mac_ocp_write(tp, 0xF85A, 0xC526);
+        r8168_mac_ocp_write(tp, 0xF85C, 0x64A5);
+        r8168_mac_ocp_write(tp, 0xF85E, 0x1400);
+        r8168_mac_ocp_write(tp, 0xF860, 0xF007);
+        r8168_mac_ocp_write(tp, 0xF862, 0x0C01);
+        r8168_mac_ocp_write(tp, 0xF864, 0x8CA5);
+        r8168_mac_ocp_write(tp, 0xF866, 0x1C15);
+        r8168_mac_ocp_write(tp, 0xF868, 0xC51B);
+        r8168_mac_ocp_write(tp, 0xF86A, 0x9CA0);
+        r8168_mac_ocp_write(tp, 0xF86C, 0xE013);
+        r8168_mac_ocp_write(tp, 0xF86E, 0xC519);
+        r8168_mac_ocp_write(tp, 0xF870, 0x74A0);
+        r8168_mac_ocp_write(tp, 0xF872, 0x48C4);
+        r8168_mac_ocp_write(tp, 0xF874, 0x8CA0);
+        r8168_mac_ocp_write(tp, 0xF876, 0xC516);
+        r8168_mac_ocp_write(tp, 0xF878, 0x74A4);
+        r8168_mac_ocp_write(tp, 0xF87A, 0x48C8);
+        r8168_mac_ocp_write(tp, 0xF87C, 0x48CA);
+        r8168_mac_ocp_write(tp, 0xF87E, 0x9CA4);
+        r8168_mac_ocp_write(tp, 0xF880, 0xC512);
+        r8168_mac_ocp_write(tp, 0xF882, 0x1B00);
+        r8168_mac_ocp_write(tp, 0xF884, 0x9BA0);
+        r8168_mac_ocp_write(tp, 0xF886, 0x1B1C);
+        r8168_mac_ocp_write(tp, 0xF888, 0x483F);
+        r8168_mac_ocp_write(tp, 0xF88A, 0x9BA2);
+        r8168_mac_ocp_write(tp, 0xF88C, 0x1B04);
+        r8168_mac_ocp_write(tp, 0xF88E, 0xC508);
+        r8168_mac_ocp_write(tp, 0xF890, 0x9BA0);
+        r8168_mac_ocp_write(tp, 0xF892, 0xC505);
+        r8168_mac_ocp_write(tp, 0xF894, 0xBD00);
+        r8168_mac_ocp_write(tp, 0xF896, 0xC502);
+        r8168_mac_ocp_write(tp, 0xF898, 0xBD00);
+        r8168_mac_ocp_write(tp, 0xF89A, 0x0300);
+        r8168_mac_ocp_write(tp, 0xF89C, 0x051E);
+        r8168_mac_ocp_write(tp, 0xF89E, 0xE434);
+        r8168_mac_ocp_write(tp, 0xF8A0, 0xE018);
+        r8168_mac_ocp_write(tp, 0xF8A2, 0xE092);
+        r8168_mac_ocp_write(tp, 0xF8A4, 0xDE20);
+        r8168_mac_ocp_write(tp, 0xF8A6, 0xD3C0);
+        r8168_mac_ocp_write(tp, 0xF8A8, 0xC50F);
+        r8168_mac_ocp_write(tp, 0xF8AA, 0x76A4);
+        r8168_mac_ocp_write(tp, 0xF8AC, 0x49E3);
+        r8168_mac_ocp_write(tp, 0xF8AE, 0xF007);
+        r8168_mac_ocp_write(tp, 0xF8B0, 0x49C0);
+        r8168_mac_ocp_write(tp, 0xF8B2, 0xF103);
+        r8168_mac_ocp_write(tp, 0xF8B4, 0xC607);
+        r8168_mac_ocp_write(tp, 0xF8B6, 0xBE00);
+        r8168_mac_ocp_write(tp, 0xF8B8, 0xC606);
+        r8168_mac_ocp_write(tp, 0xF8BA, 0xBE00);
+        r8168_mac_ocp_write(tp, 0xF8BC, 0xC602);
+        r8168_mac_ocp_write(tp, 0xF8BE, 0xBE00);
+        r8168_mac_ocp_write(tp, 0xF8C0, 0x0C4C);
+        r8168_mac_ocp_write(tp, 0xF8C2, 0x0C28);
+        r8168_mac_ocp_write(tp, 0xF8C4, 0x0C2C);
+        r8168_mac_ocp_write(tp, 0xF8C6, 0xDC00);
+        r8168_mac_ocp_write(tp, 0xF8C8, 0xC707);
+        r8168_mac_ocp_write(tp, 0xF8CA, 0x1D00);
+        r8168_mac_ocp_write(tp, 0xF8CC, 0x8DE2);
+        r8168_mac_ocp_write(tp, 0xF8CE, 0x48C1);
+        r8168_mac_ocp_write(tp, 0xF8D0, 0xC502);
+        r8168_mac_ocp_write(tp, 0xF8D2, 0xBD00);
+        r8168_mac_ocp_write(tp, 0xF8D4, 0x00AA);
+        r8168_mac_ocp_write(tp, 0xF8D6, 0xE0C0);
+        r8168_mac_ocp_write(tp, 0xF8D8, 0xC502);
+        r8168_mac_ocp_write(tp, 0xF8DA, 0xBD00);
+        r8168_mac_ocp_write(tp, 0xF8DC, 0x0132);
+
+        r8168_mac_ocp_write(tp, 0xFC26, 0x8000);
+
+        r8168_mac_ocp_write(tp, 0xFC2A, 0x0743);
+        r8168_mac_ocp_write(tp, 0xFC2C, 0x0801);
+        r8168_mac_ocp_write(tp, 0xFC2E, 0x0BE9);
+        r8168_mac_ocp_write(tp, 0xFC30, 0x02FD);
+        r8168_mac_ocp_write(tp, 0xFC32, 0x0C25);
+        r8168_mac_ocp_write(tp, 0xFC34, 0x00A9);
+        r8168_mac_ocp_write(tp, 0xFC36, 0x012D);
+
         rtl_hw_aspm_clkreq_enable(tp, true);
 }
 
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index aba6eea72f15..6e07f5ebacfc 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -262,7 +262,7 @@ static int sis900_get_mac_addr(struct pci_dev *pci_dev,
         /* check to see if we have sane EEPROM */
         signature = (u16) read_eeprom(ioaddr, EEPROMSignature);
         if (signature == 0xffff || signature == 0x0000) {
-                printk (KERN_WARNING "%s: Error EERPOM read %x\n",
+                printk (KERN_WARNING "%s: Error EEPROM read %x\n",
                         pci_name(pci_dev), signature);
                 return 0;
         }
@@ -359,9 +359,9 @@ static int sis635_get_mac_addr(struct pci_dev *pci_dev,
  *
  *      SiS962 or SiS963 model, use EEPROM to store MAC address. And EEPROM
  *      is shared by
- *      LAN and 1394. When access EEPROM, send EEREQ signal to hardware first
+ *      LAN and 1394. When accessing EEPROM, send EEREQ signal to hardware first
  *      and wait for EEGNT. If EEGNT is ON, EEPROM is permitted to be accessed
- *      by LAN, otherwise is not. After MAC address is read from EEPROM, send
+ *      by LAN, otherwise it is not. After MAC address is read from EEPROM, send
  *      EEDONE signal to refuse EEPROM access by LAN.
  *      The EEPROM map of SiS962 or SiS963 is different to SiS900.
  *      The signature field in SiS962 or SiS963 spec is meaningless.
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index f320f9a0de8b..32a89744972d 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2570,7 +2570,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                         ret = PTR_ERR(slave_data->ifphy);
                         dev_err(&pdev->dev,
                                 "%d: Error retrieving port phy: %d\n", i, ret);
-                        return ret;
+                        goto err_node_put;
                 }
 
                 slave_data->slave_node = slave_node;
@@ -2589,7 +2589,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                         if (ret) {
                                 if (ret != -EPROBE_DEFER)
                                         dev_err(&pdev->dev, "failed to register fixed-link phy: %d\n", ret);
-                                return ret;
+                                goto err_node_put;
                         }
                         slave_data->phy_node = of_node_get(slave_node);
                 } else if (parp) {
@@ -2607,7 +2607,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                         of_node_put(mdio_node);
                         if (!mdio) {
                                 dev_err(&pdev->dev, "Missing mdio platform device\n");
-                                return -EINVAL;
+                                ret = -EINVAL;
+                                goto err_node_put;
                         }
                         snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
                                  PHY_ID_FMT, mdio->name, phyid);
@@ -2622,7 +2623,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                 if (slave_data->phy_if < 0) {
                         dev_err(&pdev->dev, "Missing or malformed slave[%d] phy-mode property\n",
                                 i);
-                        return slave_data->phy_if;
+                        ret = slave_data->phy_if;
+                        goto err_node_put;
                 }
 
 no_phy_slave:
@@ -2633,7 +2635,7 @@ no_phy_slave:
                         ret = ti_cm_get_macid(&pdev->dev, i,
                                               slave_data->mac_addr);
                         if (ret)
-                                return ret;
+                                goto err_node_put;
                 }
                 if (data->dual_emac) {
                         if (of_property_read_u32(slave_node, "dual_emac_res_vlan",
@@ -2648,11 +2650,17 @@ no_phy_slave:
                 }
 
                 i++;
-                if (i == data->slaves)
-                        break;
+                if (i == data->slaves) {
+                        ret = 0;
+                        goto err_node_put;
+                }
         }
 
         return 0;
+
+err_node_put:
+        of_node_put(slave_node);
+        return ret;
 }
 
 static void cpsw_remove_dt(struct platform_device *pdev)
@@ -2675,8 +2683,10 @@ static void cpsw_remove_dt(struct platform_device *pdev)
                 of_node_put(slave_data->phy_node);
 
                 i++;
-                if (i == data->slaves)
+                if (i == data->slaves) {
+                        of_node_put(slave_node);
                         break;
+                }
         }
 
         of_platform_depopulate(&pdev->dev);
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index b4ab1a5f6cd0..78f0f2d59e22 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -855,7 +855,6 @@ static int tlan_init(struct net_device *dev)
                        dev->name);
                 return -ENOMEM;
         }
-        memset(priv->dma_storage, 0, dma_size);
         priv->rx_list = (struct tlan_list *)
                 ALIGN((unsigned long)priv->dma_storage, 8);
         priv->rx_list_dma = ALIGN(priv->dma_storage_dma, 8);
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 7b9350dbebdd..2a6ec5394966 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1196,7 +1196,6 @@ static int rr_open(struct net_device *dev)
                 goto error;
         }
         rrpriv->rx_ctrl_dma = dma_addr;
-        memset(rrpriv->rx_ctrl, 0, 256*sizeof(struct ring_ctrl));
 
         rrpriv->info = pci_alloc_consistent(pdev, sizeof(struct rr_info),
                                             &dma_addr);
@@ -1205,7 +1204,6 @@ static int rr_open(struct net_device *dev)
                 goto error;
         }
         rrpriv->info_dma = dma_addr;
-        memset(rrpriv->info, 0, sizeof(struct rr_info));
         wmb();
 
         spin_lock_irqsave(&rrpriv->lock, flags);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 8b4ad10cf940..69e0a2acfcb0 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1292,6 +1292,7 @@ static const struct usb_device_id products[] = {
         {QMI_FIXED_INTF(0x2001, 0x7e16, 3)},    /* D-Link DWM-221 */
         {QMI_FIXED_INTF(0x2001, 0x7e19, 4)},    /* D-Link DWM-221 B1 */
         {QMI_FIXED_INTF(0x2001, 0x7e35, 4)},    /* D-Link DWM-222 */
+        {QMI_FIXED_INTF(0x2001, 0x7e3d, 4)},    /* D-Link DWM-222 A2 */
         {QMI_FIXED_INTF(0x2020, 0x2031, 4)},    /* Olicard 600 */
         {QMI_FIXED_INTF(0x2020, 0x2033, 4)},    /* BroadMobi BM806U */
         {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)},    /* Sierra Wireless MC7700 */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 3f48f05dd2a6..2a1918f25e47 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -3430,7 +3430,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
                         err = -ENOMEM;
                         goto err_ver;
                 }
-                memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
                 adapter->coal_conf->coalMode = VMXNET3_COALESCE_DISABLED;
                 adapter->default_coal_mode = true;
         }
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e43a566eef77..0606416dc971 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -7541,6 +7541,8 @@ static int ath10k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
                                                                 &vht_nss,
                                                                 true);
                         update_bitrate_mask = false;
+                } else {
+                        vht_pfr = 0;
                 }
 
                 mutex_lock(&ar->conf_mutex);
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index 93526dfaf791..1f500cddb3a7 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -80,7 +80,9 @@
 #define IWL_22000_QU_B_HR_B_FW_PRE      "iwlwifi-Qu-b0-hr-b0-"
 #define IWL_22000_HR_B_FW_PRE           "iwlwifi-QuQnj-b0-hr-b0-"
 #define IWL_22000_HR_A0_FW_PRE          "iwlwifi-QuQnj-a0-hr-a0-"
+#define IWL_QU_C_HR_B_FW_PRE            "iwlwifi-Qu-c0-hr-b0-"
 #define IWL_QU_B_JF_B_FW_PRE            "iwlwifi-Qu-b0-jf-b0-"
+#define IWL_QU_C_JF_B_FW_PRE            "iwlwifi-Qu-c0-jf-b0-"
 #define IWL_QUZ_A_HR_B_FW_PRE           "iwlwifi-QuZ-a0-hr-b0-"
 #define IWL_QUZ_A_JF_B_FW_PRE           "iwlwifi-QuZ-a0-jf-b0-"
 #define IWL_QNJ_B_JF_B_FW_PRE           "iwlwifi-QuQnj-b0-jf-b0-"
@@ -109,6 +111,8 @@
         IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"
 #define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
         IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode"
+#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \
+        IWL_QU_C_HR_B_FW_PRE __stringify(api) ".ucode"
 #define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \
         IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"
 #define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)             \
@@ -256,6 +260,30 @@ const struct iwl_cfg iwl_ax201_cfg_qu_hr = {
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
 };
 
+const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = {
+        .name = "Intel(R) Wi-Fi 6 AX101",
+        .fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
+        IWL_DEVICE_22500,
+        /*
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
+        .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+};
+
+const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = {
+        .name = "Intel(R) Wi-Fi 6 AX201 160MHz",
+        .fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
+        IWL_DEVICE_22500,
+        /*
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
+        .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+};
+
 const struct iwl_cfg iwl_ax101_cfg_quz_hr = {
         .name = "Intel(R) Wi-Fi 6 AX101",
         .fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,
@@ -372,6 +400,30 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {
         IWL_DEVICE_22500,
 };
 
+const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0 = {
+        .name = "Intel(R) Wireless-AC 9461",
+        .fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
+        IWL_DEVICE_22500,
+};
+
+const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0 = {
+        .name = "Intel(R) Wireless-AC 9462",
+        .fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
+        IWL_DEVICE_22500,
+};
+
+const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0 = {
+        .name = "Intel(R) Wireless-AC 9560",
+        .fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
+        IWL_DEVICE_22500,
+};
+
+const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = {
+        .name = "Intel(R) Wireless-AC 9560 160MHz",
+        .fw_name_pre = IWL_QU_C_JF_B_FW_PRE,
+        IWL_DEVICE_22500,
+};
+
 const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {
         .name = "Intel(R) Wireless-AC 9560 160MHz",
         .fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,
@@ -590,6 +642,7 @@ MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index bc267bd2c3b0..1c1bf1b281cd 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -565,10 +565,13 @@ extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
 extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;
 extern const struct iwl_cfg iwl22000_2ac_cfg_jf;
 extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;
+extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;
 extern const struct iwl_cfg iwl22000_2ax_cfg_hr;
 extern const struct iwl_cfg iwl_ax200_cfg_cc;
 extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
+extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
+extern const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg iwl_ax201_cfg_quz_hr;
 extern const struct iwl_cfg iwl_ax1650i_cfg_quz_hr;
 extern const struct iwl_cfg iwl_ax1650s_cfg_quz_hr;
@@ -580,6 +583,10 @@ extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0;
 extern const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0;
 extern const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0;
 extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0;
+extern const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0;
+extern const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0;
+extern const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0;
+extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0;
 extern const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0;
 extern const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0;
 extern const struct iwl_cfg iwl22000_2ax_cfg_jf;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index 93da96a7247c..cb4c5514a556 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -328,6 +328,8 @@ enum {
 #define CSR_HW_REV_TYPE_NONE            (0x00001F0)
 #define CSR_HW_REV_TYPE_QNJ             (0x0000360)
 #define CSR_HW_REV_TYPE_QNJ_B0          (0x0000364)
+#define CSR_HW_REV_TYPE_QU_B0           (0x0000334)
+#define CSR_HW_REV_TYPE_QU_C0           (0x0000338)
 #define CSR_HW_REV_TYPE_QUZ             (0x0000354)
 #define CSR_HW_REV_TYPE_HR_CDB          (0x0000340)
 #define CSR_HW_REV_TYPE_SO              (0x0000370)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index ccc83fd74649..ea2a03d4bf55 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -604,6 +604,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)},
         {IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)},
+        {IWL_PCI_DEVICE(0x2526, 0x6014, iwl9260_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x8014, iwl9260_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0x8010, iwl9260_2ac_160_cfg)},
         {IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_160_cfg)},
@@ -971,6 +972,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
         {IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax211_2ax_cfg_so_gf_a0)},
         {IWL_PCI_DEVICE(0x7A70, 0x0510, iwlax211_2ax_cfg_so_gf_a0)},
         {IWL_PCI_DEVICE(0x7A70, 0x0A10, iwlax211_2ax_cfg_so_gf_a0)},
+        {IWL_PCI_DEVICE(0x7AF0, 0x0090, iwlax211_2ax_cfg_so_gf_a0)},
         {IWL_PCI_DEVICE(0x7AF0, 0x0310, iwlax211_2ax_cfg_so_gf_a0)},
         {IWL_PCI_DEVICE(0x7AF0, 0x0510, iwlax211_2ax_cfg_so_gf_a0)},
         {IWL_PCI_DEVICE(0x7AF0, 0x0A10, iwlax211_2ax_cfg_so_gf_a0)},
@@ -1037,6 +1039,27 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
                 iwl_trans->cfg = cfg;
         }
+
+        /*
+         * This is a hack to switch from Qu B0 to Qu C0.  We need to
+         * do this for all cfgs that use Qu B0.  All this code is in
+         * urgent need for a refactor, but for now this is the easiest
+         * thing to do to support Qu C-step.
+         */
+        if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QU_C0) {
+                if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)
+                        iwl_trans->cfg = &iwl_ax101_cfg_qu_c0_hr_b0;
+                else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
+                        iwl_trans->cfg = &iwl_ax201_cfg_qu_c0_hr_b0;
+                else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
+                        iwl_trans->cfg = &iwl9461_2ac_cfg_qu_c0_jf_b0;
+                else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
+                        iwl_trans->cfg = &iwl9462_2ac_cfg_qu_c0_jf_b0;
+                else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
+                        iwl_trans->cfg = &iwl9560_2ac_cfg_qu_c0_jf_b0;
+                else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
+                        iwl_trans->cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0;
+        }
 #endif
 
         pci_set_drvdata(pdev, iwl_trans);
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
index 67b81c7221c4..7e3a621b9c0d 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
@@ -372,15 +372,10 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         struct queue_entry *entry = (struct queue_entry *)urb->context;
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
 
-        if (!test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
+        if (!test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
                 return;
 
         /*
-         * Report the frame as DMA done
-         */
-        rt2x00lib_dmadone(entry);
-
-        /*
          * Check if the received data is simply too small
          * to be actually valid, or if the urb is signaling
          * a problem.
@@ -389,6 +384,11 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
                 set_bit(ENTRY_DATA_IO_FAILED, &entry->flags);
 
         /*
+         * Report the frame as DMA done
+         */
+        rt2x00lib_dmadone(entry);
+
+        /*
          * Schedule the delayed work for reading the RX status
          * from the device.
          */