diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-03-11 17:14:44 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:10:59 +0000 |
| commit | af8eead6fa5b6ad75aed293d3b6d4e5d269d8bb1 (patch) | |
| tree | 63d6a539838129c7aaa7e7794a49ad7c388ecfbd | |
| parent | 4092df040ffadd65454f61073b977440d699869c (diff) | |
| download | backport-iwlwifi-af8eead6fa5b6ad75aed293d3b6d4e5d269d8bb1.tar.gz | |
[BUGFIX] wifi: mac80211: parse puncturing bitmap in 6 GHz
In ieee80211_chandef_he_6ghz_oper(), the HE/EHT information for
the 6 GHz channel is parsed, but ieee80211_chandef_eht_oper()
calls must be paired with extracting the puncturing bitmap. Fix
this.
type=bugfix
fixes=I4d7fe2f126b2366c1312010e2900dfb2abffa0f6
ticket=jira:WIFI-379740
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Change-Id: Id0dca4624127fa8f8e8aba1dcf9890b6327a3795
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98602
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: a87eb110edd96bc69c6c0281d115c53e00ea2afe
| -rw-r--r-- | net/mac80211/util.c | 2 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index a237cbcf7b..a5d5e05688 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -3136,6 +3136,8 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_local *local, } else { ieee80211_chandef_eht_oper((const void *)eht_oper->optional, &he_chandef); + he_chandef.punctured = + ieee80211_eht_oper_dis_subchan_bitmap(eht_oper); } if (!cfg80211_chandef_valid(&he_chandef)) @@ -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:12005:e041616b" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12006:a87eb110" |