update to Ubuntu-6.1.0-1.1

[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 84c433094deaac47343ae7b25fbc2bdbc8eec519..135d17c06e1ae5b2bc7a3615b8d8f45e9edc9f55 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
@@ -13,15 +13,16 @@ connected ports (for no real reason). To avoid problems with ARP
 we simply use the MAC of the first connected port.
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  net/bridge/br_stp_if.c | 5 +----
  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 75204d36d7f9..1fb5ff73ec1e 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)
+@@ -265,10 +265,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
                return false;
  
        list_for_each_entry(p, &br->port_list, list) {