From 0dafe39fd7483acfbedae17add3a66120be12e6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 2 Apr 2020 19:19:11 +0200 Subject: [PATCH] - up to 5.6.2 --- kernel-small_fixes.patch | 34 ---------------------------------- kernel.spec | 4 ++-- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index e048ce59..dc2c31ff 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 -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 diff --git a/kernel.spec b/kernel.spec index c014ad99..017b9c1e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ %define rel 1 %define basever 5.6 -%define postver .1 +%define postver .2 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -123,7 +123,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz # Source0-md5: 7b9199ec5fa563ece9ed585ffb17798f %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: e59edecce5fb2839c9951ab8dad50e48 +# Patch0-md5: 07be77524655091203e24eed91b951c7 %endif Source1: kernel.sysconfig -- 2.44.0