linux5.6: update to 5.6.2.
This commit is contained in:
parent
5256023541
commit
5adb866f2d
2 changed files with 2 additions and 37 deletions
|
@ -1,35 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'linux5.6'
|
# Template file for 'linux5.6'
|
||||||
pkgname=linux5.6
|
pkgname=linux5.6
|
||||||
version=5.6.1
|
version=5.6.2
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="linux-${version}"
|
wrksrc="linux-${version}"
|
||||||
short_desc="Linux kernel and modules (${version%.*} series)"
|
short_desc="Linux kernel and modules (${version%.*} series)"
|
||||||
|
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="https://www.kernel.org"
|
homepage="https://www.kernel.org"
|
||||||
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
|
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
|
||||||
checksum=46d8fd446d0f6aa4b039d92d9a4992dfa1bf67e4274ec1b77616daf5174f1530
|
checksum=2d4d91d8329c1ed3826c61463650dd4bfbb6ad39dcee6dba4f98a7e94a67b5b9
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
|
|
||||||
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
|
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
|
||||||
|
|
Loading…
Reference in a new issue