aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-12-06 00:17:59 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-12-11 20:20:16 +0100
commit0a59e2a76e6d58d95b8a0bdeca86090ceb794a59 (patch)
tree63a246005456e157cf0665067591a8ca8a107934 /package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch
parent3f5fecfd33d4c1c0bc96b790549ec7dc91e57781 (diff)
downloadupstream-0a59e2a76e6d58d95b8a0bdeca86090ceb794a59.tar.gz
upstream-0a59e2a76e6d58d95b8a0bdeca86090ceb794a59.tar.bz2
upstream-0a59e2a76e6d58d95b8a0bdeca86090ceb794a59.zip
mac80211: Update to version 4.19.161-1
The removed patches were applied upstream. The changes to 357-mac80211-optimize-skb-resizing.patch are more complex. I think the patch already took care of the new changes done upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch')
-rw-r--r--package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch b/package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch
deleted file mode 100644
index e3f18131b7..0000000000
--- a/package/kernel/mac80211/patches/subsys/370-mac80211-fix-misplaced-while-instead-of-if.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5981fe5b0529ba25d95f37d7faa434183ad618c5 Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Mon, 3 Aug 2020 11:02:10 +0200
-Subject: [PATCH] mac80211: fix misplaced while instead of if
-
-This never was intended to be a 'while' loop, it should've
-just been an 'if' instead of 'while'. Fix this.
-
-I noticed this while applying another patch from Ben that
-intended to fix a busy loop at this spot.
-
-Cc: stable@vger.kernel.org
-Fixes: b16798f5b907 ("mac80211: mark station unauthorized before key removal")
-Reported-by: Ben Greear <greearb@candelatech.com>
-Link: https://lore.kernel.org/r/20200803110209.253009ae41ff.I3522aad099392b31d5cf2dcca34cbac7e5832dde@changeid
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/sta_info.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -980,7 +980,7 @@ static void __sta_info_destroy_part2(str
- might_sleep();
- lockdep_assert_held(&local->sta_mtx);
-
-- while (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
-+ if (sta->sta_state == IEEE80211_STA_AUTHORIZED) {
- ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
- WARN_ON_ONCE(ret);
- }