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

Cross-merge networking fixes after downstream PR (net-7.1-rc7).

Silent conflicts:

net/wireless/nl80211.c
  cb9959ab5f99 ("wifi: cfg80211: enforce HE/EHT cap/oper consistency")
  a384ae969902 ("wifi: cfg80211: move AP HT/VHT/... operation to beacon info")
https://lore.kernel.org/aiGJDaHV4UlCexIQ@sirena.org.uk

Conflicts:

drivers/net/wireless/intel/iwlwifi/mld/ap.c
  a342c99cb70d ("wifi: iwlwifi: mld: honor BSS_CHANGED_BEACON_ENABLED")
  9bf1b409afc7 ("wifi: iwlwifi: mld: send tx power constraints before link activation")
https://lore.kernel.org/ah2bfedhV45ZxMO8@sirena.org.uk

drivers/net/wireless/intel/iwlwifi/pcie/drv.c
  093305d801fa ("wifi: iwlwifi: pcie: simplify the resume flow if fast resume is not used")
  e2323929a68a ("wifi: iwlwifi: pcie: add debug print for resume flow if powered off")
https://lore.kernel.org/ah2bfedhV45ZxMO8@sirena.org.uk

Adjacent changes:

drivers/net/ethernet/airoha/airoha_eth.c
  b38cae85d1c4 ("net: airoha: Fix use-after-free in metadata dst teardown")
  ec6c391bcca7 ("net: airoha: Introduce airoha_gdm_dev struct")

drivers/net/ethernet/microchip/lan743x_main.c
  8173d22b211f ("net: lan743x: permit VLAN-tagged packets up to configured MTU")
  e3c6508a46f5 ("net: lan743x: avoid netdev-based logging before netdev registration")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/airoha/airoha_eth.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

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

diff --cc drivers/net/ethernet/microchip/lan743x_main.c
index d40c277af112b1acd263d000ae8c16d16c09e007,ffac22883e497199b7c8a0566f20acfc79fa430e..1cdce35e1423912ed1592eba5a28ab7b87922579
--- 1/drivers/net/ethernet/microchip/lan743x_main.c
--- 2/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@@ -1215,9 -1215,40 +1215,39 @@@ static void lan743x_mac_set_address(str
        lan743x_csr_write(adapter, MAC_RX_ADDRH, addr_hi);
  
        ether_addr_copy(adapter->mac_address, addr);
 -      netif_info(adapter, drv, adapter->netdev,
 -                 "MAC address set to %pM\n", addr);
 +      dev_dbg(&adapter->pdev->dev, "MAC address set to %pM\n", addr);
  }
  
+ static void lan743x_mac_rx_enable_fse(struct lan743x_adapter *adapter)
+ {
+       u32 mac_rx;
+       bool rxen;
+ 
+       mac_rx = lan743x_csr_read(adapter, MAC_RX);
+       if (mac_rx & MAC_RX_FSE_)
+               return;
+ 
+       rxen = mac_rx & MAC_RX_RXEN_;
+       if (rxen) {
+               mac_rx &= ~MAC_RX_RXEN_;
+               lan743x_csr_write(adapter, MAC_RX, mac_rx);
+               lan743x_csr_wait_for_bit(adapter, MAC_RX, MAC_RX_RXD_,
+                                        1, 1000, 20000, 100);
+       }
+ 
+       /* Per AN2948, hardware prevents modification of the FSE bit while the
+        * MAC receiver is enabled (RXEN bit set). Use separate register write
+        * to assert the FSE bit before enabling the RXEN bit in MAC_RX
+        */
+       mac_rx |= MAC_RX_FSE_;
+       lan743x_csr_write(adapter, MAC_RX, mac_rx);
+ 
+       if (rxen) {
+               mac_rx |= MAC_RX_RXEN_;
+               lan743x_csr_write(adapter, MAC_RX, mac_rx);
+       }
+ }
+ 
  static int lan743x_mac_init(struct lan743x_adapter *adapter)
  {
        bool mac_address_valid = true;

diff --cc drivers/net/ethernet/realtek/rtase/rtase_main.c
Simple merge

diff --cc drivers/net/geneve.c
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/mld/ap.c
index bc426b911ce5c91493f4b1950a20d4944844f036,6598d933333300ca9c708a70211335cf5da3e442..37f4de8b0281f85526a15eab4999cf818f8c2fe0
--- 1/drivers/net/wireless/intel/iwlwifi/mld/ap.c
--- 2/drivers/net/wireless/intel/iwlwifi/mld/ap.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/ap.c
@@@ -325,9 -272,10 +324,6 @@@ int iwl_mld_start_ap_ibss(struct ieee80
        struct ieee80211_chanctx_conf *ctx;
        int ret;
  
-       if (vif->type == NL80211_IFTYPE_AP)
-               iwl_mld_send_ap_tx_power_constraint_cmd(mld, vif, link);
 -      ret = iwl_mld_update_beacon_template(mld, vif, link);
 -      if (ret)
 -              return ret;
--
        /* the link should be already activated when assigning chan context,
         * and LINK_CONTEXT_MODIFY_EHT_PARAMS is deprecated
         */

diff --cc drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mld/power.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/ops.c
Simple merge

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

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

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

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

diff --cc net/ipv6/mcast.c
Simple merge

diff --cc net/l2tp/l2tp_ppp.c
Simple merge

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

diff --cc net/mptcp/options.c
Simple merge

diff --cc net/netfilter/nf_conntrack_irc.c
Simple merge

diff --cc net/rds/ib_cm.c
Simple merge

diff --cc net/sched/act_api.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/wireless/nl80211.c
index cdb5e9b77143d7a0e9a7631632040b6750699137,76c537a6e8b52d6819cf2ea096fe3a2e941a7916..d947a9f6045a95a432a2d0e4efc243365f182f9a
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -6987,12 -6699,27 +6990,18 @@@ static int nl80211_calculate_ap_capabil
                params->eht_cap = (void *)(cap->data + 1);
                if (!ieee80211_eht_capa_size_ok((const u8 *)params->he_cap,
                                                (const u8 *)params->eht_cap,
 -                                              cap->datalen - 1, true))
 -                      return -EINVAL;
 -      }
 -      cap = cfg80211_find_ext_elem(WLAN_EID_EXT_EHT_OPERATION, ies, ies_len);
 -      if (cap) {
 -              if (!cap->datalen)
 -                      return -EINVAL;
 -              params->eht_oper = (void *)(cap->data + 1);
 -              if (!ieee80211_eht_oper_size_ok((const u8 *)params->eht_oper,
 -                                              cap->datalen - 1))
 +                                              cap->datalen - 1, true)) {
 +                      GENL_SET_ERR_MSG(info, "bad EHT capability in beacon");
                        return -EINVAL;
 +              }
        }
  
 -      if (!!params->he_cap != !!params->he_oper)
++      if (!!params->he_cap != !!params->beacon.he_oper)
+               return -EINVAL;
+ 
 -      if (!!params->eht_cap != !!params->eht_oper)
++      if (!!params->eht_cap != !!params->beacon.eht_oper)
+               return -EINVAL;
+ 
        return 0;
  }
  

diff --cc net/xdp/xsk.c
Simple merge

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

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