diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-02 23:20:40 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-04 01:07:17 +0200 |
commit | 1b5a45a4a74732fc7d17911a12d178517292cc5b (patch) | |
tree | 1284382c50b324d43d10fc966fe3f80e63665b02 /package/kernel/mac80211/patches/subsys/374-mac80211-fix-rate-mask-reset.patch | |
parent | a883e3af386a6aef80fae14facbf1981eb8e91bc (diff) | |
download | upstream-1b5a45a4a74732fc7d17911a12d178517292cc5b.tar.gz upstream-1b5a45a4a74732fc7d17911a12d178517292cc5b.tar.bz2 upstream-1b5a45a4a74732fc7d17911a12d178517292cc5b.zip |
mac80211: Update to backports version 4.19.189-1
The removed patches were applied upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/374-mac80211-fix-rate-mask-reset.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/374-mac80211-fix-rate-mask-reset.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/package/kernel/mac80211/patches/subsys/374-mac80211-fix-rate-mask-reset.patch b/package/kernel/mac80211/patches/subsys/374-mac80211-fix-rate-mask-reset.patch deleted file mode 100644 index 36d5bee123..0000000000 --- a/package/kernel/mac80211/patches/subsys/374-mac80211-fix-rate-mask-reset.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4311a94e7598ca19311b04eb965556b5bb33accd Mon Sep 17 00:00:00 2001 -From: Johannes Berg <johannes.berg@intel.com> -Date: Fri, 12 Feb 2021 11:22:14 +0100 -Subject: [PATCH] mac80211: fix rate mask reset - -[ Upstream commit 1944015fe9c1d9fa5e9eb7ffbbb5ef8954d6753b ] - -Coverity reported the strange "if (~...)" condition that's -always true. It suggested that ! was intended instead of ~, -but upon further analysis I'm convinced that what really was -intended was a comparison to 0xff/0xffff (in HT/VHT cases -respectively), since this indicates that all of the rates -are enabled. - -Change the comparison accordingly. - -I'm guessing this never really mattered because a reset to -not having a rate mask is basically equivalent to having a -mask that enables all rates. - -Reported-by: Colin Ian King <colin.king@canonical.com> -Fixes: 2ffbe6d33366 ("mac80211: fix and optimize MCS mask handling") -Fixes: b119ad6e726c ("mac80211: add rate mask logic for vht rates") -Reviewed-by: Colin Ian King <colin.king@canonical.com> -Link: https://lore.kernel.org/r/20210212112213.36b38078f569.I8546a20c80bc1669058eb453e213630b846e107b@changeid -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Sasha Levin <sashal@kernel.org> ---- - net/mac80211/cfg.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/net/mac80211/cfg.c -+++ b/net/mac80211/cfg.c -@@ -2779,14 +2779,14 @@ static int ieee80211_set_bitrate_mask(st - continue; - - for (j = 0; j < IEEE80211_HT_MCS_MASK_LEN; j++) { -- if (~sdata->rc_rateidx_mcs_mask[i][j]) { -+ if (sdata->rc_rateidx_mcs_mask[i][j] != 0xff) { - sdata->rc_has_mcs_mask[i] = true; - break; - } - } - - for (j = 0; j < NL80211_VHT_NSS_MAX; j++) { -- if (~sdata->rc_rateidx_vht_mcs_mask[i][j]) { -+ if (sdata->rc_rateidx_vht_mcs_mask[i][j] != 0xffff) { - sdata->rc_has_vht_mcs_mask[i] = true; - break; - } |