diff options
| author | Arkadiusz Miśkiewicz | 2020-04-02 17:19:11 (GMT) |
|---|---|---|
| committer | Arkadiusz Miśkiewicz | 2020-04-02 17:19:11 (GMT) |
| commit | 0dafe39fd7483acfbedae17add3a66120be12e6b (patch) | |
| tree | 1d01bb769accc76fa476f4a9a30dd626f0ddd71a /kernel-small_fixes.patch | |
| parent | f6f51cf022efcdcb2862f0718ba1a4679d6d8092 (diff) | |
| download | kernel-0dafe39fd7483acfbedae17add3a66120be12e6b.zip kernel-0dafe39fd7483acfbedae17add3a66120be12e6b.tar.gz | |
- up to 5.6.2auto/th/kernel-5.6.2-1
Diffstat (limited to 'kernel-small_fixes.patch')
| -rw-r--r-- | kernel-small_fixes.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index e048ce5..dc2c31f 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -106,38 +106,4 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacra aac_define_int_mode(dev); if (dev->msi_enabled) -From be8c827f50a0bcd56361b31ada11dc0a3c2fd240 Mon Sep 17 00:00:00 2001 -From: Johannes Berg <johannes.berg@intel.com> -Date: Sun, 29 Mar 2020 22:50:06 +0200 -Subject: 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 @@ begin: - * 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) && --- -cgit 1.2-0.3.lf.el7 |