From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 18 Mar 2025 08:45:23 +0000 (+0100)
Subject: Merge net-next/main to resolve conflicts
X-Git-Tag: v6.15-rc1~160^2~20^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a;p=thirdparty%2Fkernel%2Flinux.git

Merge net-next/main to resolve conflicts

There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

c924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a
diff --cc net/wireless/nl80211.c
index aee49d43cf862,34c0dfeeb7fce..299d575cf60ee
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -16518,7 -16512,10 +16524,10 @@@ static int nl80211_assoc_ml_reconf(stru
  
  	add_links = 0;
  	if (info->attrs[NL80211_ATTR_MLO_LINKS]) {
- 		err = nl80211_process_links(rdev, req.add_links, NULL, 0, info);
 -		err = nl80211_process_links(rdev, links,
++		err = nl80211_process_links(rdev, req.add_links,
+ 					    /* mark as MLO, but not assoc */
+ 					    IEEE80211_MLD_MAX_NUM_LINKS,
+ 					    NULL, 0, info);
  		if (err)
  			return err;
  
@@@ -16544,15 -16543,11 +16553,15 @@@
  		goto out;
  	}
  
 +	if (info->attrs[NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS])
 +		req.ext_mld_capa_ops =
 +			nla_get_u16(info->attrs[NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS]);
 +
- 	err = cfg80211_assoc_ml_reconf(rdev, dev, &req);
+ 	err = -EOPNOTSUPP;
  
  out:
 -	for (link_id = 0; link_id < ARRAY_SIZE(links); link_id++)
 -		cfg80211_put_bss(&rdev->wiphy, links[link_id].bss);
 +	for (link_id = 0; link_id < ARRAY_SIZE(req.add_links); link_id++)
 +		cfg80211_put_bss(&rdev->wiphy, req.add_links[link_id].bss);
  
  	return err;
  }