From 91bf8745fd575648383e5c0cc1d0ea1681c3c204 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 6 Oct 2019 00:21:24 +0200 Subject: [PATCH] - 4.9.195 --- 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 1fbd7c13..12130347 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -26,40 +26,6 @@ exit fi done -From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= -Date: Mon, 6 Feb 2017 14:45:15 +0100 -Subject: [PATCH] mac80211: Print text for disassociation reason -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When disassociation happens only numeric reason is printed -in ieee80211_rx_mgmt_disassoc(). Add text variant, too. - -Signed-off-by: Arkadiusz Miśkiewicz ---- - net/mac80211/mlme.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c -index 098ce9b179ee..fcf8d0aa66ec 100644 ---- a/net/mac80211/mlme.c -+++ b/net/mac80211/mlme.c -@@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, - - reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code); - -- sdata_info(sdata, "disassociated from %pM (Reason: %u)\n", -- mgmt->sa, reason_code); -+ sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n", -+ mgmt->sa, reason_code, -+ ieee80211_get_reason_code_string(reason_code)); - - ieee80211_set_disassoc(sdata, 0, 0, false, NULL); - --- -2.11.0 From: Shaohua Li diff --git a/kernel.spec b/kernel.spec index 94054730..1497d111 100644 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ %define rel 1 %define basever 4.9 -%define postver .194 +%define postver .195 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -125,7 +125,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: 8725261e4010a3380fb825c4fa4c0834 +# Patch0-md5: 6fe412394aab0a952af771585bdc0fdb %endif Source1: kernel.sysconfig -- 2.44.0