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

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

Conflicts:

net/vmw_vsock/af_vsock.c
  b18c83388874 ("vsock: initialize child_ns_mode_locked in vsock_net_init()")
  0de607dc4fd8 ("vsock: add G2H fallback for CIDs not owned by H2G transport")

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
  ceee35e5674a ("bnxt_en: Refactor some basic ring setup and adjustment logic")
  57cdfe0dc70b ("bnxt_en: Resize RSS contexts on channel count change")

drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
  4d56037a02bd ("wifi: iwlwifi: mld: block EMLSR during TDLS connections")
  687a95d204e7 ("wifi: iwlwifi: mld: correctly set wifi generation data")

drivers/net/wireless/intel/iwlwifi/mld/scan.h
  b6045c899e37 ("wifi: iwlwifi: mld: Refactor scan command handling")
  ec66ec6a5a8f ("wifi: iwlwifi: mld: Fix MLO scan timing")

drivers/net/wireless/intel/iwlwifi/mvm/fw.c
  078df640ef05 ("wifi: iwlwifi: mld: add support for iwl_mcc_allowed_ap_type_cmd v
2")
  323156c3541e ("wifi: iwlwifi: mvm: don't send a 6E related command when not supported")

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

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/airoha/airoha_eth.h
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

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

diff --cc drivers/net/vxlan/vxlan_core.c
Simple merge

diff --cc drivers/net/wireless/ath/ath12k/dp_rx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
index e3aec814aa0dfc4108918fd08c9f0a5cba14ca79,71a9a72c9ac0ed454e31892231858b610c4f94b6..da6fd74715688f9743a26e226894369516a2a8d8
--- 1/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
--- 2/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
@@@ -1907,15 -1880,18 +1917,24 @@@ static int iwl_mld_move_sta_state_down(
                iwl_mld_remove_sta(mld, sta);
  
                if (sta->tdls && iwl_mld_tdls_sta_count(mld) == 0) {
 -                      /* just removed last TDLS STA, so enable PM */
 +                      /* just removed last TDLS STA, so enable PM
 +                       * and unblock EMLSR
 +                       */
                        iwl_mld_update_mac_power(mld, vif, false);
 +
 +                      /* Unblock EMLSR when TDLS connection is torn down */
 +                      iwl_mld_unblock_emlsr(mld, vif,
 +                                            IWL_MLD_EMLSR_BLOCKED_TDLS);
                }
+ 
+               if (sta->tdls) {
+                       /*
+                        * update MAC since wifi generation flags may change,
+                        * we also update MAC on disassociation to the AP via
+                        * the vif assoc change
+                        */
+                       iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_MODIFY);
+               }
        } else {
                return -EINVAL;
        }

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mld/scan.h
index 772b3a02c4c4dc9b37ad1bf5d17a5c24b90fecdf,de5620e7f463b535cb24d30138e90b718251b0af..dc299fe2f999cb8fa9dabcee0d85de6b2bf8ac68
--- 1/drivers/net/wireless/intel/iwlwifi/mld/scan.h
--- 2/drivers/net/wireless/intel/iwlwifi/mld/scan.h
+++ b/drivers/net/wireless/intel/iwlwifi/mld/scan.h
@@@ -135,10 -137,9 +138,10 @@@ struct iwl_mld_scan 
        /* And here fields that survive a fw restart */
        size_t cmd_size;
        void *cmd;
 +      u8 cmd_ver;
        unsigned long last_6ghz_passive_jiffies;
        unsigned long last_start_time_jiffies;
-       u64 last_mlo_scan_time;
+       u64 last_mlo_scan_start_time;
  };
  
  /**

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 0c643f0b71054fad1f82501516f06dbfb3c16475,6cc78661116e5d74927a87d929bcc773da57befe..f05df3a3300e6f2ded8a6f304d007811460fd803
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@@ -459,13 -459,19 +459,14 @@@ static void iwl_mvm_phy_filter_init(str
  
  static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
  {
 +      int cmd_id = WIDE_ID(REGULATORY_AND_NVM_GROUP,
 +                           MCC_ALLOWED_AP_TYPE_CMD);
 +      struct iwl_mcc_allowed_ap_type_cmd_v1 cmd = {};
        u8 cmd_ver;
        int ret;
 -      struct iwl_host_cmd cmd = {
 -              .id = WIDE_ID(REGULATORY_AND_NVM_GROUP,
 -                            MCC_ALLOWED_AP_TYPE_CMD),
 -              .flags = 0,
 -              .data[0] = &mvm->fwrt.uats_table,
 -              .len[0] =  sizeof(mvm->fwrt.uats_table),
 -              .dataflags[0] = IWL_HCMD_DFL_NOCOPY,
 -      };
  
-       if (mvm->trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) {
+       if (mvm->trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210 ||
+           !mvm->trans->cfg->uhb_supported) {
                IWL_DEBUG_RADIO(mvm, "UATS feature is not supported\n");
                return;
        }

diff --cc drivers/net/wireless/virtual/virt_wifi.c
Simple merge

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

diff --cc net/bridge/br_arp_nd_proxy.c
Simple merge

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

diff --cc net/hsr/hsr_device.c
Simple merge

diff --cc net/hsr/hsr_framereg.c
Simple merge

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

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

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

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

diff --cc net/mpls/af_mpls.c
Simple merge

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

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

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

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

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

diff --cc net/qrtr/af_qrtr.c
Simple merge

diff --cc net/vmw_vsock/af_vsock.c
index cc4b225250b9112aa36c2d1135cbea22cdcf7366,d912ed2f012a3e9c503f1acf98c72b48aeaa58c1..e4756604d50b9ca2e2e138bfd40b6522430913df
--- 1/net/vmw_vsock/af_vsock.c
--- 2/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@@ -2952,7 -2928,7 +2952,8 @@@ static void vsock_net_init(struct net *
                net->vsock.mode = vsock_net_child_mode(current->nsproxy->net_ns);
  
        net->vsock.child_ns_mode = net->vsock.mode;
+       net->vsock.child_ns_mode_locked = 0;
 +      net->vsock.g2h_fallback = 1;
  }
  
  static __net_init int vsock_sysctl_init_net(struct net *net)

diff --cc tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json
Simple merge