From 7dd6ddb2413bdb867240a9621ffd5d1b479ee266 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 2 Apr 2020 21:26:01 +0100 Subject: [PATCH] linux (Generic/Allwinner): update to linux-5.6.2 --- packages/linux/package.mk | 4 +-- .../default/linux-999-5.6-iwlwifi-fix.patch | 35 ------------------- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 packages/linux/patches/default/linux-999-5.6-iwlwifi-fix.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 185fcfdf4c..4121a8cd39 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.6.1" - PKG_SHA256="46d8fd446d0f6aa4b039d92d9a4992dfa1bf67e4274ec1b77616daf5174f1530" + PKG_VERSION="5.6.2" + PKG_SHA256="2d4d91d8329c1ed3826c61463650dd4bfbb6ad39dcee6dba4f98a7e94a67b5b9" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/packages/linux/patches/default/linux-999-5.6-iwlwifi-fix.patch b/packages/linux/patches/default/linux-999-5.6-iwlwifi-fix.patch deleted file mode 100644 index 1b7de3ab6e..0000000000 --- a/packages/linux/patches/default/linux-999-5.6-iwlwifi-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 -