From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 2 Apr 2026 17:57:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ffb33d7709b59ff60560f48960a73bd8a55be95;p=thirdparty%2Flinux.git

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>
---

8ffb33d7709b59ff60560f48960a73bd8a55be95
diff --cc drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
index e3aec814aa0df,71a9a72c9ac0e..da6fd74715688
--- a/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/scan.h
index 772b3a02c4c4d,de5620e7f463b..dc299fe2f999c
--- a/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 0c643f0b71054,6cc78661116e5..f05df3a3300e6
--- a/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 net/vmw_vsock/af_vsock.c
index cc4b225250b91,d912ed2f012a3..e4756604d50b9
--- a/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)