diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-03-01 14:20:59 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:02:32 +0000 |
| commit | 0e8e85f4027641062e3b97a95142916a3cdae2be (patch) | |
| tree | 393251a3f7b02f07a88ecc54cc8598ace3153588 | |
| parent | 2f215c0b40190943dccade24955a5972acc083fb (diff) | |
| download | backport-iwlwifi-0e8e85f4027641062e3b97a95142916a3cdae2be.tar.gz | |
[BUGFIX] wifi: mac80211: fix supported rate masking in scan
We have an nl80211 attribute to mask supported rates from
probe responses in scanning, e.g. for use in P2P, but in
the refactoring I stopped applying this mask. Restore it.
type=bugfix
fixes=I9d9920858c30ae5154719783933de0d7bc2a2cb9
ticket=jira:WIFI-388941
Fixes: 07095d167749 ("wifi: mac80211: start building elements in SKBs")
Change-Id: I46b49e4fc27fe60b75d4559c01104e55ed381c37
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/97006
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 1a5efba1cafb44bdc27252947f41297eb0749394
| -rw-r--r-- | net/mac80211/util.c | 8 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index d7c4d16232..a237cbcf7b 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1216,8 +1216,8 @@ static int ieee80211_put_preq_ies_band(struct sk_buff *skb, if (band == NL80211_BAND_S1GHZ) return ieee80211_put_s1g_cap(skb, &sband->s1g_cap); - err = ieee80211_put_srates_elem(skb, sband, 0, rate_flags, 0, - WLAN_EID_SUPP_RATES); + err = ieee80211_put_srates_elem(skb, sband, 0, rate_flags, + ~rate_mask, WLAN_EID_SUPP_RATES); if (err) return err; @@ -1238,8 +1238,8 @@ static int ieee80211_put_preq_ies_band(struct sk_buff *skb, *offset = noffset; } - err = ieee80211_put_srates_elem(skb, sband, 0, rate_flags, 0, - WLAN_EID_EXT_SUPP_RATES); + err = ieee80211_put_srates_elem(skb, sband, 0, rate_flags, + ~rate_mask, WLAN_EID_EXT_SUPP_RATES); if (err) return err; @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11961:77cf7d33" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11962:1a5efba1" |