From 8ce677874b02c19e8ce3340b60f4415fc388c6bf Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 30 Mar 2020 13:10:15 +0200 Subject: [PATCH] linux56-tkg: Add pending fix for iwlwifi regression to base https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=be8c827f50a0bcd56361b31ada11dc0a3c2fd240 --- linux56-tkg/PKGBUILD | 4 +-- .../0003-glitched-base.patch | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/linux56-tkg/PKGBUILD b/linux56-tkg/PKGBUILD index 50b7d7b..b7a9090 100644 --- a/linux56-tkg/PKGBUILD +++ b/linux56-tkg/PKGBUILD @@ -89,7 +89,7 @@ pkgname=("${pkgbase}" "${pkgbase}-headers") _basekernel=5.6 _sub=0 pkgver="${_basekernel}"."${_sub}" -pkgrel=1 +pkgrel=2 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -133,7 +133,7 @@ sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622' '1f2c39041b00ad8cddc3a17b589ccdcd4e9e4524bd47cf9f6292e2bbc105398b' '31dc68e84aecfb7d069efb1305049122c65694676be8b955634abcf0675922a2' 'd02bf5ca08fd610394b9d3a0c3b176d74af206f897dee826e5cbaec97bb4a4aa' - 'dd5236f4109193dc518cf6e0a490600ae613c24232011f59d4069ce48ece32bd' + '9447bdd83f43e65f713fb4ec583203da929cb2b2fea808aad575b3fefb2fd531' '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7' 'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe' 'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb' diff --git a/linux56-tkg/linux56-tkg-patches/0003-glitched-base.patch b/linux56-tkg/linux56-tkg-patches/0003-glitched-base.patch index 7934ead..48fb349 100644 --- a/linux56-tkg/linux56-tkg-patches/0003-glitched-base.patch +++ b/linux56-tkg/linux56-tkg-patches/0003-glitched-base.patch @@ -1457,3 +1457,38 @@ index d2fa3e9ccd97c..bd10cb02fc0ff 100644 if (!strcmp(str, "force")) force_load = 1; if (!strcmp(str, "hwp_only")) +From be8c827f50a0bcd56361b31ada11dc0a3c2fd240 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +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 +Signed-off-by: David S. Miller +--- + 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 +