projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b386ed
)
wifi: mac80211: fix # of MSDU in A-MSDU calculation
author
Johannes Berg
<johannes.berg@intel.com>
Sun, 27 Aug 2023 11:05:28 +0000
(14:05 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:58:55 +0000
(11:58 +0100)
[ Upstream commit
428e8976a15f849ad92b1c1e38dda2a684350ff7
]
During my refactoring I wanted to get rid of the switch,
but replaced it with the wrong calculation. Fix that.
Fixes:
175ad2ec89fe
("wifi: mac80211: limit A-MSDU subframes for client too")
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link:
https://lore.kernel.org/r/20230827135854.51bf1b8b0adb.Iffbd337fdad2b86ae12f5a39c69fb82b517f7486@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/sta_info.c
patch
|
blob
|
history
diff --git
a/net/mac80211/sta_info.c
b/net/mac80211/sta_info.c
index
7751f8b
..
0c5cc75
100644
(file)
--- a/
net/mac80211/sta_info.c
+++ b/
net/mac80211/sta_info.c
@@
-2990,7
+2990,7
@@
void ieee80211_sta_set_max_amsdu_subframes(struct sta_info *sta,
WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB) << 1;
if (val)
- sta->sta.max_amsdu_subframes = 4 <<
val
;
+ sta->sta.max_amsdu_subframes = 4 <<
(4 - val)
;
}
#ifdef CONFIG_LOCKDEP