diff options
author | Johannes Berg <johannes.berg@intel.com> | 2024-03-13 14:42:04 +0200 |
---|---|---|
committer | iwlwifi publisher <> | 2024-04-17 13:37:21 +0000 |
commit | bcd6c3833a7b28531d9dda33bfa015ed5a167461 (patch) | |
tree | fc694110c84a159afe3a8489f381987091acb7e3 | |
parent | 0aadc508a6f7d16e93a363d0476e4fb7cda79315 (diff) | |
download | backport-iwlwifi-bcd6c3833a7b28531d9dda33bfa015ed5a167461.tar.gz |
[BUGFIX] wifi: mac80211: correctly use defragmented STA profile
For the cross-link CSA, we want to defragment the STA
profile in place to check potential elements inside.
However, it's an element, but we defragment only the
data, so it no longer has an element header after the
defragmentation. Use it correctly.
type=bugfix
fixes=Ie8453979f5805873a8411c99346bcc3810cd6476
ticket=jira:WIFI-395465
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Change-Id: If8a76780dcb0fc29fc014561ee06ab65bb53646e
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99012
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>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99147
Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com>
PerCI-Ready: Golan Ben Ami <golan.ben.ami@intel.com>
x-iwlwifi-stack-dev: baa8405b4cb6e90dcf3f41607a8786fdd7d20677
-rw-r--r-- | net/mac80211/mlme.c | 2 | ||||
-rw-r--r-- | versions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 516ab62e48..32311462e1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -6397,7 +6397,7 @@ ieee80211_mgd_check_cross_link_csa(struct ieee80211_sub_if_data *sdata, if (WARN_ON(len != sta_profiles_len[link_id])) continue; - prof = (void *)sta_profiles[link_id]->data; + prof = (void *)sta_profiles[link_id]; prof_elems = ieee802_11_parse_elems(prof->variable + (prof->sta_info_len - 1), len - @@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12021:5ed8c479" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12022:baa8405b" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |