diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-04-02 14:15:03 -0400 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-04-02 14:15:03 -0400 |
| commit | a17a09f6bc6562051c5cc9f0161d0d929b552cf3 (patch) | |
| tree | 587448128d12ca11b0c217cec73b6fd67e9c91ec | |
| parent | 1e34012f4ca47475823fac26e20fe38dac09a11d (diff) | |
| download | kernel-a17a09f6bc6562051c5cc9f0161d0d929b552cf3.tar.gz kernel-a17a09f6bc6562051c5cc9f0161d0d929b552cf3.tar.xz kernel-a17a09f6bc6562051c5cc9f0161d0d929b552cf3.zip | |
Linux v5.6.2
| -rw-r--r-- | 0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch | 35 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 39 deletions
diff --git a/0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch b/0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch deleted file mode 100644 index fb8319ecf..000000000 --- a/0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b8b93985bfe32da1230ec77c75dde398a0c3b142 Mon Sep 17 00:00:00 2001 -From: Johannes Berg <johannes.berg@intel.com> -Date: Sun, 29 Mar 2020 22:50:06 +0200 -Subject: [PATCH] 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 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, - * 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) && --- -2.26.0 - diff --git a/kernel.spec b/kernel.spec index 57a5ee5d5..768f59205 100644 --- a/kernel.spec +++ b/kernel.spec @@ -92,7 +92,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 1 +%define stable_update 2 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -891,8 +891,6 @@ Patch507: drm-dp-mst-error-handling-improvements.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1811850 Patch509: drm-i915-backports.patch -Patch510: 0001-mac80211-fix-authentication-with-iwlwifi-mvm.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1816621 # https://patchwork.ozlabs.org/patch/1260523/ Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch @@ -2995,6 +2993,9 @@ fi # # %changelog +* Thu Apr 02 2020 Jeremy Cline <jcline@redhat.com> - 5.6.2-300 +- Linux v5.6.2 + * Thu Apr 02 2020 Hans de Goede <hdegoede@redhat.com> - Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621) - Add patch fixing Lenovo X1 8th gen speaker volume control (rhbz 1820196) @@ -1,2 +1,2 @@ SHA512 (linux-5.6.tar.xz) = 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9 -SHA512 (patch-5.6.1.xz) = 12e4b57d27d4fb650f70abdaa553bb15fdc6c2cb35dd7ec657fe8c6ab4073736227491392e1d8d3b2443efb0a12927f7806891f94a9c793ea7af2c7babcbbb70 +SHA512 (patch-5.6.2.xz) = 37997dfaa8fe20d239660e466e424a102683dda5ea57770161a270a39b7796207bebfb958103a2844d8e8ae0949c6d15064bdb721b72550dd0c35c0f31ad6d55 |