- rel 1; works on x86_64

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

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index be01afc43fd622c94f0590ee44a8a0110fcf62d8..28517b8ba73a02d99c71733dc738dde08270f500 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -27,69 +27,3 @@
                        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>
----
- 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);
- 
-+      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);
- 
-       SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
-
-