rebase patches on top of Ubuntu-4.15.0-24.26

[pve-kernel.git] / patches / kernel / 0002-bridge-keep-MAC-of-first-assigned-port.patch

diff --git a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
index 69846a0fde3bcb552b638436b2243e8083f95284..74710aa87fb1b1080601f9b707f27f4988b94ba7 100644 (file)
--- a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
+++ b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
@@ -1,7 +1,7 @@
-From d9166325bf8b4d5a4c7aeb6a15c30c90ffc28347 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Thu, 14 Sep 2017 11:02:18 +0200
-Subject: [PATCH 02/14] bridge: keep MAC of first assigned port
+Subject: [PATCH] bridge: keep MAC of first assigned port
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -18,7 +18,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
-index 89110319ef0f..5e73fff65f47 100644
+index 808e2b914015..b0ad54384826 100644
 --- a/net/bridge/br_stp_if.c
 +++ b/net/bridge/br_stp_if.c
 @@ -259,10 +259,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
@@ -33,6 +33,3 @@ index 89110319ef0f..5e73fff65f47 100644
        }
  
        if (ether_addr_equal(br->bridge_id.addr, addr))
--- 
-2.14.2
-