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

Cross-merge networking fixes after downstream PR.

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
  23c93c3b6275 ("bnxt_en: do not map packet buffers twice")
  6d1add95536b ("bnxt_en: Modify TX ring indexing logic.")

tools/testing/selftests/net/Makefile
  2258b666482d ("selftests: add vlan hw filter tests")
  a0bc96c0cd6e ("selftests: net: verify fq per-band packet limit")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
index 037624f17aea26187ada7eb209a470da05bc50fe,8cb9a99154aad9e52119aa88157e78475c37bb91..c2b25fc623ecc08410e8fc45cb391d5a555cc1d9
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
@@@ -67,22 -66,16 +66,16 @@@ struct bnxt_sw_tx_bd *bnxt_xmit_bd(stru
                WRITE_ONCE(txr->tx_prod, prod);
  
                /* first fill up the first buffer */
 -              frag_tx_buf = &txr->tx_buf_ring[prod];
 +              frag_tx_buf = &txr->tx_buf_ring[RING_TX(bp, prod)];
                frag_tx_buf->page = skb_frag_page(frag);
  
 -              txbd = &txr->tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];
 +              txbd = &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];
  
                frag_len = skb_frag_size(frag);
-               frag_mapping = skb_frag_dma_map(&pdev->dev, frag, 0,
-                                               frag_len, DMA_TO_DEVICE);
- 
-               if (unlikely(dma_mapping_error(&pdev->dev, frag_mapping)))
-                       return NULL;
- 
-               dma_unmap_addr_set(frag_tx_buf, mapping, frag_mapping);
- 
                flags = frag_len << TX_BD_LEN_SHIFT;
                txbd->tx_bd_len_flags_type = cpu_to_le32(flags);
+               frag_mapping = page_pool_get_dma_addr(skb_frag_page(frag)) +
+                              skb_frag_off(frag);
                txbd->tx_bd_haddr = cpu_to_le64(frag_mapping);
  
                len = frag_len;

diff --cc drivers/net/ethernet/intel/i40e/i40e_register.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_type.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_wed_wo.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/dma.c
Simple merge

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mptcp/protocol.h
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge

diff --cc tools/testing/selftests/bpf/config.x86_64
Simple merge

diff --cc tools/testing/selftests/net/Makefile
index 14bd68da746693f4b11e073420231e885c5894f3,9e5bf59a20bff4569ec0cfd4fc1a7413975b53b0..50818075e566e1abf1f2f9e587951e5abed238fc
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -91,7 -91,7 +91,8 @@@ TEST_PROGS += test_bridge_neigh_suppres
  TEST_PROGS += test_vxlan_nolocalbypass.sh
  TEST_PROGS += test_bridge_backup_port.sh
  TEST_PROGS += fdb_flush.sh
 +TEST_PROGS += fq_band_pktlimit.sh
+ TEST_PROGS += vlan_hw_filter.sh
  
  TEST_FILES := settings
  

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
Simple merge