- 4.9.135

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index be01afc43fd622c94f0590ee44a8a0110fcf62d8..319191ce2821f2eacb3c4fdd4b50d92f33d2f795 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,70 +26,38 @@
                                exit
                        fi
                done
-
-
-
-
-From: Vasiliy Kulikov <segoon@openwall.com>
-Date: Fri, 23 Mar 2012 20:56:42 +0400
-Subject: [PATCH] proc: fix mount -t proc -o AAA
-
-proc_parse_options() inside of proc_mount() runs only once at the boot
-time without any given options.  So, following umount(2)+mount(2) ignore
-mount options: proc_parse_options() is not called as ->s_root is already
-initialized.  To fix that parse mount options unconditionally.
-
-Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
-Reported-by: Arkadiusz Miśkiewicz <a.miskiewicz@gmail.com>
+From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
+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 <arekm@maven.pl>
 ---
- fs/proc/root.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/fs/proc/root.c b/fs/proc/root.c
-index 46a15d8..eed44bf 100644
---- a/fs/proc/root.c
-+++ b/fs/proc/root.c
-@@ -115,12 +115,13 @@ static struct dentry *proc_mount(struct file_system_type *fs_type,
-       if (IS_ERR(sb))
-               return ERR_CAST(sb);
+ 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,
  
-+      if (!proc_parse_options(options, ns)) {
-+              deactivate_locked_super(sb);
-+              return ERR_PTR(-EINVAL);
-+      }
-+
-       if (!sb->s_root) {
-               sb->s_flags = flags;
--              if (!proc_parse_options(options, ns)) {
--                      deactivate_locked_super(sb);
--                      return ERR_PTR(-EINVAL);
--              }
-               err = proc_fill_super(sb);
-               if (err) {
-                       deactivate_locked_super(sb);
--- 
-1.7.0.4
-
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
-       /* Get MAC address */
-       for (i = 0; i < ETH_ALEN; i++)
-               dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
-+      if (!is_valid_ether_addr(dev->dev_addr)) {
-+              /* Report it and use a random ethernet address instead */
-+              netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+              random_ether_addr(dev->dev_addr);
-+              netdev_info(dev, "Using random MAC address: %pM\n",
-+                          dev->dev_addr);
-+      }
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+       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);
  
-       SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
 -- 
-1.7.7.3
+2.11.0
 
-