public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: manual merge of the wireless-next tree with the origin tree
@ 2022-02-22 16:12 broonie
  2022-02-22 16:45 ` Johannes Berg
  0 siblings, 1 reply; 4+ messages in thread
From: broonie @ 2022-02-22 16:12 UTC (permalink / raw)
  To: Kalle Valo, Johannes Berg, Wireless
  Cc: Ilan Peer, Jiasheng Jiang, Johannes Berg,
	Linux Kernel Mailing List, Linux Next Mailing List

Hi all,

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

  net/mac80211/mlme.c

between commit:

  a72c01a94f1d2 ("mac80211: mlme: check for null after calling kmemdup")

from the origin tree and commit:

  820acc810fb6e ("mac80211: Add EHT capabilities to association/probe request")

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.

diff --cc net/mac80211/mlme.c
index 20b57ddf149c4,197cad4a2768a..0000000000000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -671,7 -692,49 +692,49 @@@ static void ieee80211_add_he_ie(struct 
  	ieee80211_ie_build_he_6ghz_cap(sdata, skb);
  }
  
+ static void ieee80211_add_eht_ie(struct ieee80211_sub_if_data *sdata,
+ 				 struct sk_buff *skb,
+ 				 struct ieee80211_supported_band *sband)
+ {
+ 	u8 *pos;
+ 	const struct ieee80211_sta_he_cap *he_cap;
+ 	const struct ieee80211_sta_eht_cap *eht_cap;
+ 	struct ieee80211_chanctx_conf *chanctx_conf;
+ 	u8 eht_cap_size;
+ 	bool reg_cap = false;
+ 
+ 	rcu_read_lock();
+ 	chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
+ 	if (!WARN_ON_ONCE(!chanctx_conf))
+ 		reg_cap = cfg80211_chandef_usable(sdata->wdev.wiphy,
+ 						  &chanctx_conf->def,
+ 						  IEEE80211_CHAN_NO_HE |
+ 						  IEEE80211_CHAN_NO_EHT);
+ 	rcu_read_unlock();
+ 
+ 	he_cap = ieee80211_get_he_iftype_cap(sband,
+ 					     ieee80211_vif_type_p2p(&sdata->vif));
+ 	eht_cap = ieee80211_get_eht_iftype_cap(sband,
+ 					       ieee80211_vif_type_p2p(&sdata->vif));
+ 
+ 	/*
+ 	 * EHT capabilities element is only added if the HE capabilities element
+ 	 * was added so assume that 'he_cap' is valid and don't check it.
+ 	 */
+ 	if (WARN_ON(!he_cap || !eht_cap || !reg_cap))
+ 		return;
+ 
+ 	eht_cap_size =
+ 		2 + 1 + sizeof(eht_cap->eht_cap_elem) +
+ 		ieee80211_eht_mcs_nss_size(&he_cap->he_cap_elem,
+ 					   &eht_cap->eht_cap_elem) +
+ 		ieee80211_eht_ppe_size(eht_cap->eht_ppe_thres[0],
+ 				       eht_cap->eht_cap_elem.phy_cap_info);
+ 	pos = skb_put(skb, eht_cap_size);
+ 	ieee80211_ie_build_eht_cap(pos, he_cap, eht_cap, pos + eht_cap_size);
+ }
+ 
 -static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
 +static int ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
  {
  	struct ieee80211_local *local = sdata->local;
  	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

^ permalink raw reply	[flat|nested] 4+ messages in thread
* linux-next: manual merge of the wireless-next tree with the origin tree
@ 2024-10-09  0:35 Stephen Rothwell
  2024-10-09  7:12 ` Johannes Berg
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-10-09  0:35 UTC (permalink / raw)
  To: Kalle Valo, Johannes Berg
  Cc: Christophe JAILLET, Johannes Berg, Wireless,
	Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

Hi all,

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

  drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c

between commit:

  1842442007cd ("wifi: lib80211: Constify struct lib80211_crypto_ops")

from the origin tree and commit:

  02f220b52670 ("wifi: ipw2x00/lib80211: move remaining lib80211 into libipw")

from the wireless-next tree.

I fixed it up (I just used the latter version) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-09  7:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-22 16:12 linux-next: manual merge of the wireless-next tree with the origin tree broonie
2022-02-22 16:45 ` Johannes Berg
  -- strict thread matches above, loose matches on Subject: below --
2024-10-09  0:35 Stephen Rothwell
2024-10-09  7:12 ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox