From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 29 Feb 2024 22:17:54 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.9-rc1~159^2~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65f5dd4f02a89df429b8212b4c2f3ada6c4f3fc1;p=thirdparty%2Flinux.git

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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/mptcp/protocol.c
  adf1bb78dab5 ("mptcp: fix snd_wnd initialization for passive socket")
  9426ce476a70 ("mptcp: annotate lockless access for RX path fields")
https://lore.kernel.org/all/20240228103048.19255709@canb.auug.org.au/

Adjacent changes:

drivers/dpll/dpll_core.c
  0d60d8df6f49 ("dpll: rely on rcu for netdev_dpll_pin()")
  e7f8df0e81bf ("dpll: move xa_erase() call in to match dpll_pin_alloc() error path order")

drivers/net/veth.c
  1ce7d306ea63 ("veth: try harder when allocating queue memory")
  0bef512012b1 ("net: add netdev_lockdep_set_classes() to virtual drivers")

drivers/net/wireless/intel/iwlwifi/mvm/d3.c
  8c9bef26e98b ("wifi: iwlwifi: mvm: d3: implement suspend with MLO")
  78f65fbf421a ("wifi: iwlwifi: mvm: ensure offloading TID queue exists")

net/wireless/nl80211.c
  f78c1375339a ("wifi: nl80211: reject iftype change with mesh ID change")
  414532d8aa89 ("wifi: cfg80211: use IEEE80211_MAX_MESH_ID_LEN appropriately")

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

65f5dd4f02a89df429b8212b4c2f3ada6c4f3fc1
diff --cc drivers/dpll/dpll_core.c
index 93c1bb7a6ef70,241db366b2c74..12fcd420396e6
--- a/drivers/dpll/dpll_core.c
+++ b/drivers/dpll/dpll_core.c
@@@ -562,11 -565,11 +567,11 @@@ void dpll_pin_put(struct dpll_pin *pin
  {
  	mutex_lock(&dpll_lock);
  	if (refcount_dec_and_test(&pin->refcount)) {
 +		xa_erase(&dpll_pin_xa, pin->id);
  		xa_destroy(&pin->dpll_refs);
  		xa_destroy(&pin->parent_refs);
 -		xa_erase(&dpll_pin_xa, pin->id);
  		dpll_pin_prop_free(&pin->prop);
- 		kfree(pin);
+ 		kfree_rcu(pin, rcu);
  	}
  	mutex_unlock(&dpll_lock);
  }
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 6d5ed79b9fff0,05b64176859e8..70e03a9a937eb
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@@ -1309,12 -1279,14 +1309,14 @@@ static int __iwl_mvm_suspend(struct iee
  
  		mvm->net_detect = true;
  	} else {
- 		struct iwl_wowlan_config_cmd wowlan_config_cmd = {};
+ 		struct iwl_wowlan_config_cmd wowlan_config_cmd = {
+ 			.offloading_tid = 0,
+ 		};
  
 -		wowlan_config_cmd.sta_id = mvmvif->deflink.ap_sta_id;
 +		wowlan_config_cmd.sta_id = mvm_link->ap_sta_id;
  
  		ap_sta = rcu_dereference_protected(
 -			mvm->fw_id_to_mac_id[mvmvif->deflink.ap_sta_id],
 +			mvm->fw_id_to_mac_id[mvm_link->ap_sta_id],
  			lockdep_is_held(&mvm->mutex));
  		if (IS_ERR_OR_NULL(ap_sta)) {
  			ret = -EINVAL;
diff --cc net/mptcp/protocol.c
index 9df4eaddfd48b,7833a49f6214a..76c8861a852b1
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@@ -3204,18 -3242,25 +3247,25 @@@ struct sock *mptcp_sk_clone_init(const 
  
  	__mptcp_init_sock(nsk);
  
+ #if IS_ENABLED(CONFIG_MPTCP_IPV6)
+ 	if (nsk->sk_family == AF_INET6)
+ 		mptcp_copy_ip6_options(nsk, sk);
+ 	else
+ #endif
+ 		mptcp_copy_ip_options(nsk, sk);
+ 
  	msk = mptcp_sk(nsk);
 -	msk->local_key = subflow_req->local_key;
 -	msk->token = subflow_req->token;
 +	WRITE_ONCE(msk->local_key, subflow_req->local_key);
 +	WRITE_ONCE(msk->token, subflow_req->token);
  	msk->in_accept_queue = 1;
  	WRITE_ONCE(msk->fully_established, false);
  	if (mp_opt->suboptions & OPTION_MPTCP_CSUMREQD)
  		WRITE_ONCE(msk->csum_enabled, true);
  
 -	msk->write_seq = subflow_req->idsn + 1;
 -	msk->snd_nxt = msk->write_seq;
 -	msk->snd_una = msk->write_seq;
 -	msk->wnd_end = msk->snd_nxt + tcp_sk(ssk)->snd_wnd;
 +	WRITE_ONCE(msk->write_seq, subflow_req->idsn + 1);
 +	WRITE_ONCE(msk->snd_nxt, msk->write_seq);
 +	WRITE_ONCE(msk->snd_una, msk->write_seq);
- 	WRITE_ONCE(msk->wnd_end, msk->snd_nxt + req->rsk_rcv_wnd);
++	WRITE_ONCE(msk->wnd_end, msk->snd_nxt + tcp_sk(ssk)->snd_wnd);
  	msk->setsockopt_seq = mptcp_sk(sk)->setsockopt_seq;
  	mptcp_init_sched(msk, mptcp_sk(sk)->sched);