diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-02 07:07:27 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-02 07:07:27 +0200 |
| commit | 89ed54926f3ee3f90ad5e8baf10a8f4640e2db7a (patch) | |
| tree | 1b44b54993eb4dbcfd121511092c43bd997fca2c /0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch | |
| parent | 270116be509daf718539972686425b19fae0080f (diff) | |
| parent | 4c49e1a1c331e5bf2e6a75bef3adfd95469fa2d9 (diff) | |
| download | kernel-89ed54926f3ee3f90ad5e8baf10a8f4640e2db7a.tar.gz kernel-89ed54926f3ee3f90ad5e8baf10a8f4640e2db7a.tar.xz kernel-89ed54926f3ee3f90ad5e8baf10a8f4640e2db7a.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc30
Diffstat (limited to '0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch')
| -rw-r--r-- | 0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch b/0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch deleted file mode 100644 index fb8319ecf..000000000 --- a/0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b8b93985bfe32da1230ec77c75dde398a0c3b142 Mon Sep 17 00:00:00 2001 -From: Johannes Berg <johannes.berg@intel.com> -Date: Sun, 29 Mar 2020 22:50:06 +0200 -Subject: [PATCH] mac80211: fix authentication with iwlwifi/mvm - -The original patch didn't copy the ieee80211_is_data() condition -because on most drivers the management frames don't go through -this path. However, they do on iwlwifi/mvm, so we do need to keep -the condition here. - -Cc: stable@vger.kernel.org -Fixes: ce2e1ca70307 ("mac80211: Check port authorization in the ieee80211_tx_dequeue() case") -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/mac80211/tx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c -index d9cca6dbd870..efe4c1fc68e5 100644 ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -3610,7 +3610,8 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, - * Drop unicast frames to unauthorised stations unless they are - * EAPOL frames from the local station. - */ -- if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) && -+ if (unlikely(ieee80211_is_data(hdr->frame_control) && -+ !ieee80211_vif_is_mesh(&tx.sdata->vif) && - tx.sdata->vif.type != NL80211_IFTYPE_OCB && - !is_multicast_ether_addr(hdr->addr1) && - !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) && --- -2.26.0 - |