Received-SPF: pass (google.com: domain of linux-wireless+bounces-6606-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 22 Apr 2024 10:56:23 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>, Johannes Berg <johannes@sipsolutions.net>
Cc: Wireless <linux-wireless@vger.kernel.org>, Johannes Berg
 <johannes.berg@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20240422105623.7b1fbda2@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/P0JkuJR6=UOwV3U=MCBrQxx";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/P0JkuJR6=UOwV3U=MCBrQxx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/chan.c

between commit:

  89884459a0b9 ("wifi: mac80211: fix idle calculation with multi-link")

from the wireless tree and commit:

  87f5500285fb ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc net/mac80211/chan.c
index 4e0c1a6e509f,dedf11eeb43c..380695fdc32f
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@@ -800,8 -819,7 +819,8 @@@ static int ieee80211_assign_link_chanct
  	struct ieee80211_local *local =3D sdata->local;
  	struct ieee80211_chanctx_conf *conf;
  	struct ieee80211_chanctx *curr_ctx =3D NULL;
 +	bool new_idle;
- 	int ret =3D 0;
+ 	int ret;
 =20
  	if (WARN_ON(sdata->vif.type =3D=3D NL80211_IFTYPE_NAN))
  		return -EOPNOTSUPP;
@@@ -822,17 -840,24 +841,22 @@@
  		ieee80211_recalc_chanctx_min_def(local, new_ctx, link);
 =20
  		ret =3D drv_assign_vif_chanctx(local, sdata, link->conf, new_ctx);
- 		if (ret)
- 			goto out;
-=20
- 		conf =3D &new_ctx->conf;
- 		list_add(&link->assigned_chanctx_list,
- 			 &new_ctx->assigned_links);
+ 		if (assign_on_failure || !ret) {
+ 			/* Need to continue, see _ieee80211_set_active_links */
+ 			WARN_ON_ONCE(ret && !local->in_reconfig);
+ 			ret =3D 0;
+=20
+ 			/* succeeded, so commit it to the data structures */
+ 			conf =3D &new_ctx->conf;
+ 			list_add(&link->assigned_chanctx_list,
+ 				 &new_ctx->assigned_links);
+ 		}
+ 	} else {
+ 		ret =3D 0;
  	}
 =20
- out:
  	rcu_assign_pointer(link->conf->chanctx_conf, conf);
 =20
 -	sdata->vif.cfg.idle =3D !conf;
 -
  	if (curr_ctx && ieee80211_chanctx_num_assigned(local, curr_ctx) > 0) {
  		ieee80211_recalc_chanctx_chantype(local, curr_ctx);
  		ieee80211_recalc_smps_chanctx(local, curr_ctx);

--Sig_/P0JkuJR6=UOwV3U=MCBrQxx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYltbcACgkQAVBC80lX
0GxfBAf/TGFiNoDJ4g3bno2FzMVTWyL/dQDogND/PFuxrVZLDHZcFn8sHXOclrfn
I5PRAXTs6J7X3zYtrmoQyJN/BuhkAocmDtHPgFTx1BAnrO42/GmbKC1/SpWdG47V
JxwX/s16So6O2sGNKCDFpyVcjAAFkeZvRX4td6XJNkLA6zH0LIABVzWYzsw3Bg//
R3Vi8wsjkcrqGD8DEdheyw54bSKnNSxIFan4/1ivIsmvDWDpEkwGof2fKTbY/3XJ
KgVjOFmrzC071pmhplBzmQDA0f5AaTV3wTuB3GeY/89aajf6lvN+/QNGXZXWbo3o
kk+ON7Ib/KGj/+z/RAlmEuNvUBaekQ==
=aLjw
-----END PGP SIGNATURE-----

--Sig_/P0JkuJR6=UOwV3U=MCBrQxx--