Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Tue, 24 Oct 2023 11:24:24 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Kalle Valo <kvalo@kernel.org>,
        Johannes Berg <johannes@sipsolutions.net>
Cc:     Wireless <linux-wireless@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Avraham Stern <avraham.stern@intel.com>,
        Gregory Greenman <gregory.greenman@intel.com>,
        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 net-next tree with the wireless
 tree
Message-ID: <20231024112424.7de86457@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Nw9FIGoSTm34d8mrxtC=U0K";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Nw9FIGoSTm34d8mrxtC=U0K
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  net/mac80211/rx.c

between commit:

  91535613b609 ("wifi: mac80211: don't drop all unprotected public action f=
rames")

from the wireless tree and commit:

  6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() re=
turn value")

from the net-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/rx.c
index 8f6b6f56b65b,051db97a92b4..000000000000
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@@ -2468,14 -2469,15 +2469,14 @@@ ieee80211_drop_unencrypted_mgmt(struct=20
 =20
  		/* drop unicast public action frames when using MPF */
  		if (is_unicast_ether_addr(mgmt->da) &&
 -		    ieee80211_is_public_action((void *)rx->skb->data,
 -					       rx->skb->len))
 +		    ieee80211_is_protected_dual_of_public_action(rx->skb))
- 			return -EACCES;
+ 			return RX_DROP_U_UNPROT_UNICAST_PUB_ACTION;
  	}
 =20
- 	return 0;
+ 	return RX_CONTINUE;
  }
 =20
- static int
+ static ieee80211_rx_result
  __ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
  {
  	struct ieee80211_sub_if_data *sdata =3D rx->sdata;

--Sig_/Nw9FIGoSTm34d8mrxtC=U0K
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU3DrgACgkQAVBC80lX
0GxQowgAjrrkc0sOifGahOamyKGt/SatG8ExWc66k2mkZDrxIkTp97v9XTACMawX
ghc6Tr6alRgFWvjNGXGDZkR/l9nEqOz+UQKzjRV7FL3RtssbglmEQvO5B7M0XO1L
LmZPuQIk1fbMIh9fC5QwFjQkQvRCH0E0IcFvwmqx6WGg/F+8a8HhM9gQPyhIy0UD
nZCrQR938eNkEfWUJPJSWA4c79NYYwzxqgyAO7+wYRw/ywj56wMEEKN6TEujjed9
k3knHieuIrlgjbSPDTlkIbqTq0p+7U46xOmhuybHn7aIDTWPKts+91suTTrTnZHJ
sCqklT3h+BQlsNlrTSSR9iOC6oJBzA==
=zLiy
-----END PGP SIGNATURE-----

--Sig_/Nw9FIGoSTm34d8mrxtC=U0K--