Received-SPF: pass (google.com: domain of linux-kernel+bounces-58884-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 9 Feb 2024 10:56:06 +1100
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>, Daniel Gabay
 <daniel.gabay@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>, Miri Korenblit
 <miriam.rachel.korenblit@intel.com>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20240209105606.66e7808b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_NyQymrl.JNnwVrYyY.hUzv";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/_NyQymrl.JNnwVrYyY.hUzv
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:

  drivers/net/wireless/intel/iwlwifi/mvm/tx.c

between commit:

  2e57b77583ca ("wifi: iwlwifi: mvm: use correct address 3 in A-MSDU")

from the wireless tree and commit:

  3d869feacb74 ("wifi: iwlwifi: mvm: use FW rate for non-data only on new d=
evices")

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 drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 461f26d9214e,4981bb1f0251..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@@ -520,16 -520,31 +520,41 @@@ static void iwl_mvm_set_tx_cmd_crypto(s
  	}
  }
 =20
 +static void iwl_mvm_copy_hdr(void *cmd, const void *hdr, int hdrlen,
 +			     const u8 *addr3_override)
 +{
 +	struct ieee80211_hdr *out_hdr =3D cmd;
 +
 +	memcpy(cmd, hdr, hdrlen);
 +	if (addr3_override)
 +		memcpy(out_hdr->addr3, addr3_override, ETH_ALEN);
 +}
 +
+ static bool iwl_mvm_use_host_rate(struct iwl_mvm *mvm,
+ 				  struct iwl_mvm_sta *mvmsta,
+ 				  struct ieee80211_hdr *hdr,
+ 				  struct ieee80211_tx_info *info)
+ {
+ 	if (unlikely(!mvmsta))
+ 		return true;
+=20
+ 	if (unlikely(info->control.flags & IEEE80211_TX_CTRL_RATE_INJECT))
+ 		return true;
+=20
+ 	if (likely(ieee80211_is_data(hdr->frame_control) &&
+ 		   mvmsta->sta_state >=3D IEEE80211_STA_AUTHORIZED))
+ 		return false;
+=20
+ 	/*
+ 	 * Not a data frame, use host rate if on an old device that
+ 	 * can't possibly be doing MLO (firmware may be selecting a
+ 	 * bad rate), if we might be doing MLO we need to let FW pick
+ 	 * (since we don't necesarily know the link), but FW rate
+ 	 * selection was fixed.
+ 	 */
+ 	return mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ;
+ }
+=20
  /*
   * Allocates and sets the Tx cmd the driver data pointers in the skb
   */

--Sig_/_NyQymrl.JNnwVrYyY.hUzv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXFahYACgkQAVBC80lX
0GxqUQf9Gn+VS0VsOzqLDeD950s6TnUCH7fNBvRJ4gsxYgXFMeUb5Ztixn1QPJvL
o1I7HQGueNStvqVlSMWyyhytUdbdxucoc/pUeYYKBWWbGxSVNLPiSQ2WvXO/2cbL
Ru1/YmqcgIR/fRFS/qIrxHop0vrvXwv+3c3Ka0QCG/qi/zIoGrSxJUHH9rKRR+AV
BXfjgJQlaL0HoJ+l0PlhxVl5RnKphgLPXmRLwsJDR+tNnn0VoKTW0YN07jJSeEad
yZ2x7c9lFnZ2f2hmY6dXRKEQo1W3CHfisP3yVOckAfdIkasPK6ZK3tPV2IEhL3Te
M885DZ3y6ea5dK6svCtdSvpr/A5gOA==
=0bto
-----END PGP SIGNATURE-----

--Sig_/_NyQymrl.JNnwVrYyY.hUzv--