Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:
 "A decent batch of fixes here. I'd say about half are for problems that
  have existed for a while, and half are for new regressions added in
  the 4.20 merge window.

   1) Fix 10G SFP phy module detection in mvpp2, from Baruch Siach.

   2) Revert bogus emac driver change, from Benjamin Herrenschmidt.

   3) Handle BPF exported data structure with pointers when building
      32-bit userland, from Daniel Borkmann.

   4) Memory leak fix in act_police, from Davide Caratti.

   5) Check RX checksum offload in RX descriptors properly in aquantia
      driver, from Dmitry Bogdanov.

   6) SKB unlink fix in various spots, from Edward Cree.

   7) ndo_dflt_fdb_dump() only works with ethernet, enforce this, from
      Eric Dumazet.

   8) Fix FID leak in mlxsw driver, from Ido Schimmel.

   9) IOTLB locking fix in vhost, from Jean-Philippe Brucker.

  10) Fix SKB truesize accounting in ipv4/ipv6/netfilter frag memory
      limits otherwise namespace exit can hang. From Jiri Wiesner.

  11) Address block parsing length fixes in x25 from Martin Schiller.

  12) IRQ and ring accounting fixes in bnxt_en, from Michael Chan.

  13) For tun interfaces, only iface delete works with rtnl ops, enforce
      this by disallowing add. From Nicolas Dichtel.

  14) Use after free in liquidio, from Pan Bian.

  15) Fix SKB use after passing to netif_receive_skb(), from Prashant
      Bhole.

  16) Static key accounting and other fixes in XPS from Sabrina Dubroca.

  17) Partially initialized flow key passed to ip6_route_output(), from
      Shmulik Ladkani.

  18) Fix RTNL deadlock during reset in ibmvnic driver, from Thomas
      Falcon.

  19) Several small TCP fixes (off-by-one on window probe abort, NULL
      deref in tail loss probe, SNMP mis-estimations) from Yuchung
      Cheng"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (93 commits)
  net/sched: cls_flower: Reject duplicated rules also under skip_sw
  bnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.
  bnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.
  bnxt_en: Keep track of reserved IRQs.
  bnxt_en: Fix CNP CoS queue regression.
  net/mlx4_core: Correctly set PFC param if global pause is turned off.
  Revert "net/ibm/emac: wrong bit is used for STA control"
  neighbour: Avoid writing before skb->head in neigh_hh_output()
  ipv6: Check available headroom in ip6_xmit() even without options
  tcp: lack of available data can also cause TSO defer
  ipv6: sr: properly initialize flowi6 prior passing to ip6_route_output
  mlxsw: spectrum_switchdev: Fix VLAN device deletion via ioctl
  mlxsw: spectrum_router: Relax GRE decap matching check
  mlxsw: spectrum_switchdev: Avoid leaking FID's reference count
  mlxsw: spectrum_nve: Remove easily triggerable warnings
  ipv4: ipv6: netfilter: Adjust the frag mem limit when truesize changes
  sctp: frag_point sanity check
  tcp: fix NULL ref in tail loss probe
  tcp: Do not underestimate rwnd_limited
  net: use skb_list_del_init() to remove from RX sublists
  ...

31 files changed, 205 insertions, 109 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index f43fb2f958a5..93dfcef8afc4 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2086,6 +2086,9 @@ void bond_3ad_unbind_slave(struct slave *slave)
                    aggregator->aggregator_identifier);
 
         /* Tell the partner that this port is not suitable for aggregation */
+        port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION;
+        port->actor_oper_port_state &= ~AD_STATE_COLLECTING;
+        port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING;
         port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
         __update_lacpdu_from_port(port);
         ad_lacpdu_send(port);
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 65f10fec25b3..0b3e51f248c2 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -116,8 +116,7 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds)
         /* Reset the switch. */
         REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,
                   GLOBAL_ATU_CONTROL_SWRESET |
-                  GLOBAL_ATU_CONTROL_ATUSIZE_1024 |
-                  GLOBAL_ATU_CONTROL_ATE_AGE_5MIN);
+                  GLOBAL_ATU_CONTROL_LEARNDIS);
 
         /* Wait up to one second for reset to complete. */
         timeout = jiffies + 1 * HZ;
@@ -142,13 +141,10 @@ static int mv88e6060_setup_global(struct dsa_switch *ds)
          */
         REG_WRITE(REG_GLOBAL, GLOBAL_CONTROL, GLOBAL_CONTROL_MAX_FRAME_1536);
 
-        /* Enable automatic address learning, set the address
-         * database size to 1024 entries, and set the default aging
-         * time to 5 minutes.
+        /* Disable automatic address learning.
          */
         REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,
-                  GLOBAL_ATU_CONTROL_ATUSIZE_1024 |
-                  GLOBAL_ATU_CONTROL_ATE_AGE_5MIN);
+                  GLOBAL_ATU_CONTROL_LEARNDIS);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index f02592f43fe3..a7e853fa43c2 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -674,7 +674,7 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
 
                 rx_stat = (0x0000003CU & rxd_wb->status) >> 2;
 
-                is_rx_check_sum_enabled = (rxd_wb->type) & (0x3U << 19);
+                is_rx_check_sum_enabled = (rxd_wb->type >> 19) & 0x3U;
 
                 pkt_type = 0xFFU & (rxd_wb->type >> 4);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index d4c300117529..5d21c14853ac 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5162,6 +5162,7 @@ static int bnxt_hwrm_get_rings(struct bnxt *bp)
                 cp = le16_to_cpu(resp->alloc_cmpl_rings);
                 stats = le16_to_cpu(resp->alloc_stat_ctx);
                 cp = min_t(u16, cp, stats);
+                hw_resc->resv_irqs = cp;
                 if (bp->flags & BNXT_FLAG_CHIP_P5) {
                         int rx = hw_resc->resv_rx_rings;
                         int tx = hw_resc->resv_tx_rings;
@@ -5175,7 +5176,7 @@ static int bnxt_hwrm_get_rings(struct bnxt *bp)
                                 hw_resc->resv_rx_rings = rx;
                                 hw_resc->resv_tx_rings = tx;
                         }
-                        cp = le16_to_cpu(resp->alloc_msix);
+                        hw_resc->resv_irqs = le16_to_cpu(resp->alloc_msix);
                         hw_resc->resv_hw_ring_grps = rx;
                 }
                 hw_resc->resv_cp_rings = cp;
@@ -5353,7 +5354,7 @@ static int bnxt_hwrm_reserve_rings(struct bnxt *bp, int tx, int rx, int grp,
                 return bnxt_hwrm_reserve_vf_rings(bp, tx, rx, grp, cp, vnic);
 }
 
-static int bnxt_cp_rings_in_use(struct bnxt *bp)
+static int bnxt_nq_rings_in_use(struct bnxt *bp)
 {
         int cp = bp->cp_nr_rings;
         int ulp_msix, ulp_base;
@@ -5368,10 +5369,22 @@ static int bnxt_cp_rings_in_use(struct bnxt *bp)
         return cp;
 }
 
+static int bnxt_cp_rings_in_use(struct bnxt *bp)
+{
+        int cp;
+
+        if (!(bp->flags & BNXT_FLAG_CHIP_P5))
+                return bnxt_nq_rings_in_use(bp);
+
+        cp = bp->tx_nr_rings + bp->rx_nr_rings;
+        return cp;
+}
+
 static bool bnxt_need_reserve_rings(struct bnxt *bp)
 {
         struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
         int cp = bnxt_cp_rings_in_use(bp);
+        int nq = bnxt_nq_rings_in_use(bp);
         int rx = bp->rx_nr_rings;
         int vnic = 1, grp = rx;
 
@@ -5387,7 +5400,7 @@ static bool bnxt_need_reserve_rings(struct bnxt *bp)
                 rx <<= 1;
         if (BNXT_NEW_RM(bp) &&
             (hw_resc->resv_rx_rings != rx || hw_resc->resv_cp_rings != cp ||
-             hw_resc->resv_vnics != vnic ||
+             hw_resc->resv_irqs < nq || hw_resc->resv_vnics != vnic ||
              (hw_resc->resv_hw_ring_grps != grp &&
               !(bp->flags & BNXT_FLAG_CHIP_P5))))
                 return true;
@@ -5397,7 +5410,7 @@ static bool bnxt_need_reserve_rings(struct bnxt *bp)
 static int __bnxt_reserve_rings(struct bnxt *bp)
 {
         struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
-        int cp = bnxt_cp_rings_in_use(bp);
+        int cp = bnxt_nq_rings_in_use(bp);
         int tx = bp->tx_nr_rings;
         int rx = bp->rx_nr_rings;
         int grp, rx_rings, rc;
@@ -5422,7 +5435,7 @@ static int __bnxt_reserve_rings(struct bnxt *bp)
         tx = hw_resc->resv_tx_rings;
         if (BNXT_NEW_RM(bp)) {
                 rx = hw_resc->resv_rx_rings;
-                cp = hw_resc->resv_cp_rings;
+                cp = hw_resc->resv_irqs;
                 grp = hw_resc->resv_hw_ring_grps;
                 vnic = hw_resc->resv_vnics;
         }
@@ -6292,6 +6305,8 @@ hwrm_func_qcaps_exit:
         return rc;
 }
 
+static int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);
+
 static int bnxt_hwrm_func_qcaps(struct bnxt *bp)
 {
         int rc;
@@ -6299,6 +6314,11 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp)
         rc = __bnxt_hwrm_func_qcaps(bp);
         if (rc)
                 return rc;
+        rc = bnxt_hwrm_queue_qportcfg(bp);
+        if (rc) {
+                netdev_err(bp->dev, "hwrm query qportcfg failure rc: %d\n", rc);
+                return rc;
+        }
         if (bp->hwrm_spec_code >= 0x10803) {
                 rc = bnxt_alloc_ctx_mem(bp);
                 if (rc)
@@ -7026,7 +7046,12 @@ unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp)
 
 unsigned int bnxt_get_max_func_cp_rings_for_en(struct bnxt *bp)
 {
-        return bp->hw_resc.max_cp_rings - bnxt_get_ulp_msix_num(bp);
+        unsigned int cp = bp->hw_resc.max_cp_rings;
+
+        if (!(bp->flags & BNXT_FLAG_CHIP_P5))
+                cp -= bnxt_get_ulp_msix_num(bp);
+
+        return cp;
 }
 
 static unsigned int bnxt_get_max_func_irqs(struct bnxt *bp)
@@ -7048,7 +7073,9 @@ int bnxt_get_avail_msix(struct bnxt *bp, int num)
         int total_req = bp->cp_nr_rings + num;
         int max_idx, avail_msix;
 
-        max_idx = min_t(int, bp->total_irqs, max_cp);
+        max_idx = bp->total_irqs;
+        if (!(bp->flags & BNXT_FLAG_CHIP_P5))
+                max_idx = min_t(int, bp->total_irqs, max_cp);
         avail_msix = max_idx - bp->cp_nr_rings;
         if (!BNXT_NEW_RM(bp) || avail_msix >= num)
                 return avail_msix;
@@ -7066,7 +7093,7 @@ static int bnxt_get_num_msix(struct bnxt *bp)
         if (!BNXT_NEW_RM(bp))
                 return bnxt_get_max_func_irqs(bp);
 
-        return bnxt_cp_rings_in_use(bp);
+        return bnxt_nq_rings_in_use(bp);
 }
 
 static int bnxt_init_msix(struct bnxt *bp)
@@ -7794,6 +7821,7 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up)
 
                 rc = bnxt_hwrm_func_resc_qcaps(bp, true);
                 hw_resc->resv_cp_rings = 0;
+                hw_resc->resv_irqs = 0;
                 hw_resc->resv_tx_rings = 0;
                 hw_resc->resv_rx_rings = 0;
                 hw_resc->resv_hw_ring_grps = 0;
@@ -9799,13 +9827,16 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,
                                 int *max_cp)
 {
         struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
-        int max_ring_grps = 0;
+        int max_ring_grps = 0, max_irq;
 
         *max_tx = hw_resc->max_tx_rings;
         *max_rx = hw_resc->max_rx_rings;
-        *max_cp = min_t(int, bnxt_get_max_func_cp_rings_for_en(bp),
-                        hw_resc->max_irqs - bnxt_get_ulp_msix_num(bp));
-        *max_cp = min_t(int, *max_cp, hw_resc->max_stat_ctxs);
+        *max_cp = bnxt_get_max_func_cp_rings_for_en(bp);
+        max_irq = min_t(int, bnxt_get_max_func_irqs(bp) -
+                        bnxt_get_ulp_msix_num(bp),
+                        bnxt_get_max_func_stat_ctxs(bp));
+        if (!(bp->flags & BNXT_FLAG_CHIP_P5))
+                *max_cp = min_t(int, *max_cp, max_irq);
         max_ring_grps = hw_resc->max_hw_ring_grps;
         if (BNXT_CHIP_TYPE_NITRO_A0(bp) && BNXT_PF(bp)) {
                 *max_cp -= 1;
@@ -9813,6 +9844,11 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,
         }
         if (bp->flags & BNXT_FLAG_AGG_RINGS)
                 *max_rx >>= 1;
+        if (bp->flags & BNXT_FLAG_CHIP_P5) {
+                bnxt_trim_rings(bp, max_rx, max_tx, *max_cp, false);
+                /* On P5 chips, max_cp output param should be available NQs */
+                *max_cp = max_irq;
+        }
         *max_rx = min_t(int, *max_rx, max_ring_grps);
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 9e99d4ab3e06..3030931ccaf8 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -928,6 +928,7 @@ struct bnxt_hw_resc {
         u16     min_stat_ctxs;
         u16     max_stat_ctxs;
         u16     max_irqs;
+        u16     resv_irqs;
 };
 
 #if defined(CONFIG_BNXT_SRIOV)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index b59b382d34f9..0a3097baafde 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -168,7 +168,7 @@ static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id,
         if (BNXT_NEW_RM(bp)) {
                 struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
 
-                avail_msix = hw_resc->resv_cp_rings - bp->cp_nr_rings;
+                avail_msix = hw_resc->resv_irqs - bp->cp_nr_rings;
                 edev->ulp_tbl[ulp_id].msix_requested = avail_msix;
         }
         bnxt_fill_msix_vecs(bp, ent);
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 4c3925af53bc..abe5d0dac851 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -111,7 +111,7 @@ static const char oct_stats_strings[][ETH_GSTRING_LEN] = {
         "mac_tx_one_collision",
         "mac_tx_multi_collision",
         "mac_tx_max_collision_fail",
-        "mac_tx_max_deferal_fail",
+        "mac_tx_max_deferral_fail",
         "mac_tx_fifo_err",
         "mac_tx_runts",
 
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
index ea9859e028d4..de61060721c4 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
@@ -349,13 +349,15 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct,
         struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
         struct sk_buff *skb = sc->ctxptr;
         struct net_device *ndev = skb->dev;
+        u32 iq_no;
 
         dma_unmap_single(&oct->pci_dev->dev, sc->dmadptr,
                          sc->datasize, DMA_TO_DEVICE);
         dev_kfree_skb_any(skb);
+        iq_no = sc->iq_no;
         octeon_free_soft_command(oct, sc);
 
-        if (octnet_iq_is_full(oct, sc->iq_no))
+        if (octnet_iq_is_full(oct, iq_no))
                 return;
 
         if (netif_queue_stopped(ndev))
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index c415ac67cb7b..e80fedb27cee 100644
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -2786,7 +2786,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
         if (!muram_node) {
                 dev_err(&of_dev->dev, "%s: could not find MURAM node\n",
                         __func__);
-                goto fman_node_put;
+                goto fman_free;
         }
 
         err = of_address_to_resource(muram_node, 0,
@@ -2795,11 +2795,10 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
                 of_node_put(muram_node);
                 dev_err(&of_dev->dev, "%s: of_address_to_resource() = %d\n",
                         __func__, err);
-                goto fman_node_put;
+                goto fman_free;
         }
 
         of_node_put(muram_node);
-        of_node_put(fm_node);
 
         err = devm_request_irq(&of_dev->dev, irq, fman_irq, IRQF_SHARED,
                                "fman", fman);
diff --git a/drivers/net/ethernet/ibm/emac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h
index e2f80cca9bed..0d2de6f67676 100644
--- a/drivers/net/ethernet/ibm/emac/emac.h
+++ b/drivers/net/ethernet/ibm/emac/emac.h
@@ -231,7 +231,7 @@ struct emac_regs {
 #define EMAC_STACR_PHYE                 0x00004000
 #define EMAC_STACR_STAC_MASK            0x00003000
 #define EMAC_STACR_STAC_READ            0x00001000
-#define EMAC_STACR_STAC_WRITE           0x00000800
+#define EMAC_STACR_STAC_WRITE           0x00002000
 #define EMAC_STACR_OPBC_MASK            0x00000C00
 #define EMAC_STACR_OPBC_50              0x00000000
 #define EMAC_STACR_OPBC_66              0x00000400
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index c0203a0d5e3b..ed50b8dee44f 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1859,7 +1859,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,
 
         if (adapter->reset_reason != VNIC_RESET_FAILOVER &&
             adapter->reset_reason != VNIC_RESET_CHANGE_PARAM)
-                netdev_notify_peers(netdev);
+                call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
 
         netif_carrier_on(netdev);
 
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 7a37a37e3fb3..125ea99418df 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4375,8 +4375,27 @@ static void mvpp2_phylink_validate(struct net_device *dev,
                                    unsigned long *supported,
                                    struct phylink_link_state *state)
 {
+        struct mvpp2_port *port = netdev_priv(dev);
         __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 
+        /* Invalid combinations */
+        switch (state->interface) {
+        case PHY_INTERFACE_MODE_10GKR:
+        case PHY_INTERFACE_MODE_XAUI:
+                if (port->gop_id != 0)
+                        goto empty_set;
+                break;
+        case PHY_INTERFACE_MODE_RGMII:
+        case PHY_INTERFACE_MODE_RGMII_ID:
+        case PHY_INTERFACE_MODE_RGMII_RXID:
+        case PHY_INTERFACE_MODE_RGMII_TXID:
+                if (port->gop_id == 0)
+                        goto empty_set;
+                break;
+        default:
+                break;
+        }
+
         phylink_set(mask, Autoneg);
         phylink_set_port_modes(mask);
         phylink_set(mask, Pause);
@@ -4384,6 +4403,8 @@ static void mvpp2_phylink_validate(struct net_device *dev,
 
         switch (state->interface) {
         case PHY_INTERFACE_MODE_10GKR:
+        case PHY_INTERFACE_MODE_XAUI:
+        case PHY_INTERFACE_MODE_NA:
                 phylink_set(mask, 10000baseCR_Full);
                 phylink_set(mask, 10000baseSR_Full);
                 phylink_set(mask, 10000baseLR_Full);
@@ -4391,7 +4412,11 @@ static void mvpp2_phylink_validate(struct net_device *dev,
                 phylink_set(mask, 10000baseER_Full);
                 phylink_set(mask, 10000baseKR_Full);
                 /* Fall-through */
-        default:
+        case PHY_INTERFACE_MODE_RGMII:
+        case PHY_INTERFACE_MODE_RGMII_ID:
+        case PHY_INTERFACE_MODE_RGMII_RXID:
+        case PHY_INTERFACE_MODE_RGMII_TXID:
+        case PHY_INTERFACE_MODE_SGMII:
                 phylink_set(mask, 10baseT_Half);
                 phylink_set(mask, 10baseT_Full);
                 phylink_set(mask, 100baseT_Half);
@@ -4403,11 +4428,18 @@ static void mvpp2_phylink_validate(struct net_device *dev,
                 phylink_set(mask, 1000baseT_Full);
                 phylink_set(mask, 1000baseX_Full);
                 phylink_set(mask, 2500baseX_Full);
+                break;
+        default:
+                goto empty_set;
         }
 
         bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);
         bitmap_and(state->advertising, state->advertising, mask,
                    __ETHTOOL_LINK_MODE_MASK_NBITS);
+        return;
+
+empty_set:
+        bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
 }
 
 static void mvpp22_xlg_link_state(struct mvpp2_port *port,
diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig
index 36054e6fb9d3..f200b8c420d5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig
@@ -5,7 +5,7 @@
 config MLX4_EN
         tristate "Mellanox Technologies 1/10/40Gbit Ethernet support"
         depends on MAY_USE_DEVLINK
-        depends on PCI
+        depends on PCI && NETDEVICES && ETHERNET && INET
         select MLX4_CORE
         imply PTP_1588_CLOCK
         ---help---
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index f11b45001cad..d290f0787dfb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,
 
         tx_pause = !!(pause->tx_pause);
         rx_pause = !!(pause->rx_pause);
-        rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause);
-        tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause);
+        rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp;
+        tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp;
 
         err = mlx4_SET_PORT_general(mdev->dev, priv->port,
                                     priv->rx_skb_size + ETH_FCS_LEN,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index b744cd49a785..6b88881b8e35 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -3493,8 +3493,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                 dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM;
         }
 
-        /* MTU range: 46 - hw-specific max */
-        dev->min_mtu = MLX4_EN_MIN_MTU;
+        /* MTU range: 68 - hw-specific max */
+        dev->min_mtu = ETH_MIN_MTU;
         dev->max_mtu = priv->max_mtu;
 
         mdev->pndev[port] = dev;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 485d856546c6..8137454e2534 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -161,7 +161,6 @@
 #define MLX4_SELFTEST_LB_MIN_MTU (MLX4_LOOPBACK_TEST_PAYLOAD + NET_IP_ALIGN + \
                                   ETH_HLEN + PREAMBLE_LEN)
 
-#define MLX4_EN_MIN_MTU         46
 /* VLAN_HLEN is added twice,to support skb vlan tagged with multiple
  * headers. (For example: ETH_P_8021Q and ETH_P_8021AD).
  */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 16985ca3248d..624eed345b5d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -724,9 +724,9 @@ static u32 mlx5e_get_fcs(const struct sk_buff *skb)
         return __get_unaligned_cpu32(fcs_bytes);
 }
 
-static u8 get_ip_proto(struct sk_buff *skb, __be16 proto)
+static u8 get_ip_proto(struct sk_buff *skb, int network_depth, __be16 proto)
 {
-        void *ip_p = skb->data + sizeof(struct ethhdr);
+        void *ip_p = skb->data + network_depth;
 
         return (proto == htons(ETH_P_IP)) ? ((struct iphdr *)ip_p)->protocol :
                                             ((struct ipv6hdr *)ip_p)->nexthdr;
@@ -755,7 +755,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,
                 goto csum_unnecessary;
 
         if (likely(is_last_ethertype_ip(skb, &network_depth, &proto))) {
-                if (unlikely(get_ip_proto(skb, proto) == IPPROTO_SCTP))
+                if (unlikely(get_ip_proto(skb, network_depth, proto) == IPPROTO_SCTP))
                         goto csum_unnecessary;
 
                 skb->ip_summed = CHECKSUM_COMPLETE;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
index ad06d9969bc1..5c13674439f1 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
@@ -560,7 +560,7 @@ static void mlxsw_sp_nve_mc_list_ip_del(struct mlxsw_sp *mlxsw_sp,
 
         mc_record = mlxsw_sp_nve_mc_record_find(mc_list, proto, addr,
                                                 &mc_entry);
-        if (WARN_ON(!mc_record))
+        if (!mc_record)
                 return;
 
         mlxsw_sp_nve_mc_record_entry_del(mc_record, mc_entry);
@@ -647,7 +647,7 @@ void mlxsw_sp_nve_flood_ip_del(struct mlxsw_sp *mlxsw_sp,
 
         key.fid_index = mlxsw_sp_fid_index(fid);
         mc_list = mlxsw_sp_nve_mc_list_find(mlxsw_sp, &key);
-        if (WARN_ON(!mc_list))
+        if (!mc_list)
                 return;
 
         mlxsw_sp_nve_fid_flood_index_clear(fid, mc_list);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 9e9bb57134f2..6ebf99cc3154 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -1275,15 +1275,12 @@ mlxsw_sp_ipip_entry_matches_decap(struct mlxsw_sp *mlxsw_sp,
 {
         u32 ul_tb_id = l3mdev_fib_table(ul_dev) ? : RT_TABLE_MAIN;
         enum mlxsw_sp_ipip_type ipipt = ipip_entry->ipipt;
-        struct net_device *ipip_ul_dev;
 
         if (mlxsw_sp->router->ipip_ops_arr[ipipt]->ul_proto != ul_proto)
                 return false;
 
-        ipip_ul_dev = __mlxsw_sp_ipip_netdev_ul_dev_get(ipip_entry->ol_dev);
         return mlxsw_sp_ipip_entry_saddr_matches(mlxsw_sp, ul_proto, ul_dip,
-                                                 ul_tb_id, ipip_entry) &&
-               (!ipip_ul_dev || ipip_ul_dev == ul_dev);
+                                                 ul_tb_id, ipip_entry);
 }
 
 /* Given decap parameters, find the corresponding IPIP entry. */
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 739a51f0a366..50080c60a279 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -296,7 +296,13 @@ static bool
 mlxsw_sp_bridge_port_should_destroy(const struct mlxsw_sp_bridge_port *
                                     bridge_port)
 {
-        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_port->dev);
+        struct net_device *dev = bridge_port->dev;
+        struct mlxsw_sp *mlxsw_sp;
+
+        if (is_vlan_dev(dev))
+                mlxsw_sp = mlxsw_sp_lower_get(vlan_dev_real_dev(dev));
+        else
+                mlxsw_sp = mlxsw_sp_lower_get(dev);
 
         /* In case ports were pulled from out of a bridged LAG, then
          * it's possible the reference count isn't zero, yet the bridge
@@ -2109,7 +2115,7 @@ mlxsw_sp_bridge_8021d_port_leave(struct mlxsw_sp_bridge_device *bridge_device,
 
         vid = is_vlan_dev(dev) ? vlan_dev_vlan_id(dev) : 1;
         mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);
-        if (WARN_ON(!mlxsw_sp_port_vlan))
+        if (!mlxsw_sp_port_vlan)
                 return;
 
         mlxsw_sp_port_vlan_bridge_leave(mlxsw_sp_port_vlan);
@@ -2134,8 +2140,10 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
         if (!fid)
                 return -EINVAL;
 
-        if (mlxsw_sp_fid_vni_is_set(fid))
-                return -EINVAL;
+        if (mlxsw_sp_fid_vni_is_set(fid)) {
+                err = -EINVAL;
+                goto err_vni_exists;
+        }
 
         err = mlxsw_sp_nve_fid_enable(mlxsw_sp, fid, &params, extack);
         if (err)
@@ -2149,6 +2157,7 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
         return 0;
 
 err_nve_fid_enable:
+err_vni_exists:
         mlxsw_sp_fid_put(fid);
         return err;
 }
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index 29c95423ab64..2f49eb75f3cc 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -476,16 +476,16 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
         if (err)
                 goto err_destroy_flow;
 
-        err = nfp_flower_xmit_flow(netdev, flow_pay,
-                                   NFP_FLOWER_CMSG_TYPE_FLOW_ADD);
-        if (err)
-                goto err_destroy_flow;
-
         flow_pay->tc_flower_cookie = flow->cookie;
         err = rhashtable_insert_fast(&priv->flow_table, &flow_pay->fl_node,
                                      nfp_flower_table_params);
         if (err)
-                goto err_destroy_flow;
+                goto err_release_metadata;
+
+        err = nfp_flower_xmit_flow(netdev, flow_pay,
+                                   NFP_FLOWER_CMSG_TYPE_FLOW_ADD);
+        if (err)
+                goto err_remove_rhash;
 
         port->tc_offload_cnt++;
 
@@ -494,6 +494,12 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
 
         return 0;
 
+err_remove_rhash:
+        WARN_ON_ONCE(rhashtable_remove_fast(&priv->flow_table,
+                                            &flow_pay->fl_node,
+                                            nfp_flower_table_params));
+err_release_metadata:
+        nfp_modify_flow_metadata(app, flow_pay);
 err_destroy_flow:
         kfree(flow_pay->action_data);
         kfree(flow_pay->mask_data);
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 81045dfa1cd8..44f6e4873aad 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -571,6 +571,7 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
         struct cp_private *cp;
         int handled = 0;
         u16 status;
+        u16 mask;
 
         if (unlikely(dev == NULL))
                 return IRQ_NONE;
@@ -578,6 +579,10 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
 
         spin_lock(&cp->lock);
 
+        mask = cpr16(IntrMask);
+        if (!mask)
+                goto out_unlock;
+
         status = cpr16(IntrStatus);
         if (!status || (status == 0xFFFF))
                 goto out_unlock;
diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c
index 6732f5cbde08..7c7cd9d94bcc 100644
--- a/drivers/net/ethernet/socionext/sni_ave.c
+++ b/drivers/net/ethernet/socionext/sni_ave.c
@@ -185,8 +185,8 @@
                                  NETIF_MSG_TX_ERR)
 
 /* Parameter for descriptor */
-#define AVE_NR_TXDESC           32      /* Tx descriptor */
-#define AVE_NR_RXDESC           64      /* Rx descriptor */
+#define AVE_NR_TXDESC           64      /* Tx descriptor */
+#define AVE_NR_RXDESC           256     /* Rx descriptor */
 
 #define AVE_DESC_OFS_CMDSTS     0
 #define AVE_DESC_OFS_ADDRL      4
@@ -194,6 +194,7 @@
 
 /* Parameter for ethernet frame */
 #define AVE_MAX_ETHFRAME        1518
+#define AVE_FRAME_HEADROOM      2
 
 /* Parameter for interrupt */
 #define AVE_INTM_COUNT          20
@@ -576,12 +577,13 @@ static int ave_rxdesc_prepare(struct net_device *ndev, int entry)
 
         skb = priv->rx.desc[entry].skbs;
         if (!skb) {
-                skb = netdev_alloc_skb_ip_align(ndev,
-                                                AVE_MAX_ETHFRAME);
+                skb = netdev_alloc_skb(ndev, AVE_MAX_ETHFRAME);
                 if (!skb) {
                         netdev_err(ndev, "can't allocate skb for Rx\n");
                         return -ENOMEM;
                 }
+                skb->data += AVE_FRAME_HEADROOM;
+                skb->tail += AVE_FRAME_HEADROOM;
         }
 
         /* set disable to cmdsts */
@@ -594,12 +596,12 @@ static int ave_rxdesc_prepare(struct net_device *ndev, int entry)
          * - Rx buffer begins with 2 byte headroom, and data will be put from
          *   (buffer + 2).
          * To satisfy this, specify the address to put back the buffer
-         * pointer advanced by NET_IP_ALIGN by netdev_alloc_skb_ip_align(),
-         * and expand the map size by NET_IP_ALIGN.
+         * pointer advanced by AVE_FRAME_HEADROOM, and expand the map size
+         * by AVE_FRAME_HEADROOM.
          */
         ret = ave_dma_map(ndev, &priv->rx.desc[entry],
-                          skb->data - NET_IP_ALIGN,
-                          AVE_MAX_ETHFRAME + NET_IP_ALIGN,
+                          skb->data - AVE_FRAME_HEADROOM,
+                          AVE_MAX_ETHFRAME + AVE_FRAME_HEADROOM,
                           DMA_FROM_DEVICE, &paddr);
         if (ret) {
                 netdev_err(ndev, "can't map skb for Rx\n");
@@ -1689,9 +1691,10 @@ static int ave_probe(struct platform_device *pdev)
                  pdev->name, pdev->id);
 
         /* Register as a NAPI supported driver */
-        netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx, priv->rx.ndesc);
+        netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx,
+                       NAPI_POLL_WEIGHT);
         netif_tx_napi_add(ndev, &priv->napi_tx, ave_napi_poll_tx,
-                          priv->tx.ndesc);
+                          NAPI_POLL_WEIGHT);
 
         platform_set_drvdata(pdev, ndev);
 
@@ -1913,5 +1916,6 @@ static struct platform_driver ave_driver = {
 };
 module_platform_driver(ave_driver);
 
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
 MODULE_DESCRIPTION("Socionext UniPhier AVE ethernet driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 076a8be18d67..5551fead8f66 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2550,12 +2550,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
                         netdev_warn(priv->dev, "PTP init failed\n");
         }
 
-#ifdef CONFIG_DEBUG_FS
-        ret = stmmac_init_fs(dev);
-        if (ret < 0)
-                netdev_warn(priv->dev, "%s: failed debugFS registration\n",
-                            __func__);
-#endif
         priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS;
 
         if (priv->use_riwt) {
@@ -2756,10 +2750,6 @@ static int stmmac_release(struct net_device *dev)
 
         netif_carrier_off(dev);
 
-#ifdef CONFIG_DEBUG_FS
-        stmmac_exit_fs(dev);
-#endif
-
         stmmac_release_ptp(priv);
 
         return 0;
@@ -3899,6 +3889,9 @@ static int stmmac_sysfs_ring_read(struct seq_file *seq, void *v)
         u32 tx_count = priv->plat->tx_queues_to_use;
         u32 queue;
 
+        if ((dev->flags & IFF_UP) == 0)
+                return 0;
+
         for (queue = 0; queue < rx_count; queue++) {
                 struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
 
@@ -4397,6 +4390,13 @@ int stmmac_dvr_probe(struct device *device,
                 goto error_netdev_register;
         }
 
+#ifdef CONFIG_DEBUG_FS
+        ret = stmmac_init_fs(ndev);
+        if (ret < 0)
+                netdev_warn(priv->dev, "%s: failed debugFS registration\n",
+                            __func__);
+#endif
+
         return ret;
 
 error_netdev_register:
@@ -4432,6 +4432,9 @@ int stmmac_dvr_remove(struct device *dev)
 
         netdev_info(priv->dev, "%s: removing driver", __func__);
 
+#ifdef CONFIG_DEBUG_FS
+        stmmac_exit_fs(ndev);
+#endif
         stmmac_stop_all_dma(priv);
 
         stmmac_mac_set(priv, priv->ioaddr, false);
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index fc8d5f1ee1ad..0da3d36b283b 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -608,7 +608,7 @@ static int macvlan_open(struct net_device *dev)
                 goto hash_add;
         }
 
-        err = -EBUSY;
+        err = -EADDRINUSE;
         if (macvlan_addr_busy(vlan->port, dev->dev_addr))
                 goto out;
 
@@ -706,7 +706,7 @@ static int macvlan_sync_address(struct net_device *dev, unsigned char *addr)
         } else {
                 /* Rehash and update the device filters */
                 if (macvlan_addr_busy(vlan->port, addr))
-                        return -EBUSY;
+                        return -EADDRINUSE;
 
                 if (!macvlan_passthru(port)) {
                         err = dev_uc_add(lowerdev, addr);
@@ -747,6 +747,9 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)
                 return dev_set_mac_address(vlan->lowerdev, addr);
         }
 
+        if (macvlan_addr_busy(vlan->port, addr->sa_data))
+                return -EADDRINUSE;
+
         return macvlan_sync_address(dev, addr->sa_data);
 }
 
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 23ee3967c166..18e92c19c5ab 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1880,20 +1880,17 @@ EXPORT_SYMBOL(genphy_loopback);
 
 static int __set_phy_supported(struct phy_device *phydev, u32 max_speed)
 {
-        phydev->supported &= ~(PHY_1000BT_FEATURES | PHY_100BT_FEATURES |
-                               PHY_10BT_FEATURES);
-
         switch (max_speed) {
-        default:
-                return -ENOTSUPP;
-        case SPEED_1000:
-                phydev->supported |= PHY_1000BT_FEATURES;
+        case SPEED_10:
+                phydev->supported &= ~PHY_100BT_FEATURES;
                 /* fall through */
         case SPEED_100:
-                phydev->supported |= PHY_100BT_FEATURES;
-                /* fall through */
-        case SPEED_10:
-                phydev->supported |= PHY_10BT_FEATURES;
+                phydev->supported &= ~PHY_1000BT_FEATURES;
+                break;
+        case SPEED_1000:
+                break;
+        default:
+                return -ENOTSUPP;
         }
 
         return 0;
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 83060fb349f4..ad9db652874d 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -162,7 +162,7 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
         /* 1000Base-PX or 1000Base-BX10 */
         if ((id->base.e_base_px || id->base.e_base_bx10) &&
             br_min <= 1300 && br_max >= 1200)
-                phylink_set(support, 1000baseX_Full);
+                phylink_set(modes, 1000baseX_Full);
 
         /* For active or passive cables, select the link modes
          * based on the bit rates and the cable compliance bytes.
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e244f5d7512a..005020042be9 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2293,9 +2293,9 @@ static void tun_setup(struct net_device *dev)
 static int tun_validate(struct nlattr *tb[], struct nlattr *data[],
                         struct netlink_ext_ack *extack)
 {
-        if (!data)
-                return 0;
-        return -EINVAL;
+        NL_SET_ERR_MSG(extack,
+                       "tun/tap creation via rtnetlink is not supported.");
+        return -EOPNOTSUPP;
 }
 
 static size_t tun_get_size(const struct net_device *dev)
@@ -2385,6 +2385,7 @@ static int tun_xdp_one(struct tun_struct *tun,
                        struct tun_file *tfile,
                        struct xdp_buff *xdp, int *flush)
 {
+        unsigned int datasize = xdp->data_end - xdp->data;
         struct tun_xdp_hdr *hdr = xdp->data_hard_start;
         struct virtio_net_hdr *gso = &hdr->gso;
         struct tun_pcpu_stats *stats;
@@ -2461,7 +2462,7 @@ build:
         stats = get_cpu_ptr(tun->pcpu_stats);
         u64_stats_update_begin(&stats->syncp);
         stats->rx_packets++;
-        stats->rx_bytes += skb->len;
+        stats->rx_bytes += datasize;
         u64_stats_update_end(&stats->syncp);
         put_cpu_ptr(stats);
 
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index cecfd77c9f3c..ea672145f6a6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -365,7 +365,8 @@ static unsigned int mergeable_ctx_to_truesize(void *mrg_ctx)
 static struct sk_buff *page_to_skb(struct virtnet_info *vi,
                                    struct receive_queue *rq,
                                    struct page *page, unsigned int offset,
-                                   unsigned int len, unsigned int truesize)
+                                   unsigned int len, unsigned int truesize,
+                                   bool hdr_valid)
 {
         struct sk_buff *skb;
         struct virtio_net_hdr_mrg_rxbuf *hdr;
@@ -387,7 +388,8 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
         else
                 hdr_padded_len = sizeof(struct padded_vnet_hdr);
 
-        memcpy(hdr, p, hdr_len);
+        if (hdr_valid)
+                memcpy(hdr, p, hdr_len);
 
         len -= hdr_len;
         offset += hdr_padded_len;
@@ -739,7 +741,8 @@ static struct sk_buff *receive_big(struct net_device *dev,
                                    struct virtnet_rq_stats *stats)
 {
         struct page *page = buf;
-        struct sk_buff *skb = page_to_skb(vi, rq, page, 0, len, PAGE_SIZE);
+        struct sk_buff *skb = page_to_skb(vi, rq, page, 0, len,
+                                          PAGE_SIZE, true);
 
         stats->bytes += len - vi->hdr_len;
         if (unlikely(!skb))
@@ -842,7 +845,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                 rcu_read_unlock();
                                 put_page(page);
                                 head_skb = page_to_skb(vi, rq, xdp_page,
-                                                       offset, len, PAGE_SIZE);
+                                                       offset, len,
+                                                       PAGE_SIZE, false);
                                 return head_skb;
                         }
                         break;
@@ -898,7 +902,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                 goto err_skb;
         }
 
-        head_skb = page_to_skb(vi, rq, page, offset, len, truesize);
+        head_skb = page_to_skb(vi, rq, page, offset, len, truesize, !xdp_prog);
         curr_skb = head_skb;
 
         if (unlikely(!curr_skb))
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index aa8058264d5b..d1464e3e1be2 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2884,6 +2884,10 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
 
         wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
 
+        tasklet_hrtimer_init(&data->beacon_timer,
+                             mac80211_hwsim_beacon,
+                             CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
+
         err = ieee80211_register_hw(hw);
         if (err < 0) {
                 pr_debug("mac80211_hwsim: ieee80211_register_hw failed (%d)\n",
@@ -2908,10 +2912,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
                                     data->debugfs,
                                     data, &hwsim_simulate_radar);
 
-        tasklet_hrtimer_init(&data->beacon_timer,
-                             mac80211_hwsim_beacon,
-                             CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-
         spin_lock_bh(&hwsim_radio_lock);
         err = rhashtable_insert_fast(&hwsim_radios_rht, &data->rht,
                                      hwsim_rht_params);
@@ -3703,16 +3703,16 @@ static int __init init_mac80211_hwsim(void)
         if (err)
                 goto out_unregister_pernet;
 
+        err = hwsim_init_netlink();
+        if (err)
+                goto out_unregister_driver;
+
         hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
         if (IS_ERR(hwsim_class)) {
                 err = PTR_ERR(hwsim_class);
-                goto out_unregister_driver;
+                goto out_exit_netlink;
         }
 
-        err = hwsim_init_netlink();
-        if (err < 0)
-                goto out_unregister_driver;
-
         for (i = 0; i < radios; i++) {
                 struct hwsim_new_radio_params param = { 0 };
 
@@ -3818,6 +3818,8 @@ out_free_mon:
         free_netdev(hwsim_mon);
 out_free_radios:
         mac80211_hwsim_free();
+out_exit_netlink:
+        hwsim_exit_netlink();
 out_unregister_driver:
         platform_driver_unregister(&mac80211_hwsim_driver);
 out_unregister_pernet:
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 3a5f81a66d34..6b98d8e3a5bf 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -944,10 +944,7 @@ static void vhost_iotlb_notify_vq(struct vhost_dev *d,
                 if (msg->iova <= vq_msg->iova &&
                     msg->iova + msg->size - 1 >= vq_msg->iova &&
                     vq_msg->type == VHOST_IOTLB_MISS) {
-                        mutex_lock(&node->vq->mutex);
                         vhost_poll_queue(&node->vq->poll);
-                        mutex_unlock(&node->vq->mutex);
-
                         list_del(&node->node);
                         kfree(node);
                 }