rebase patches for eoan

[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 e00ccb9b6d6b57ee026dc0458d31c21b700cd1ed..a684a53bb28fcd127f6c2d376f322cd01eaf37bd 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
@@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@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 808e2b914015..b0ad54384826 100644
+index d174d3a566aa..885e18c72c87 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)
+@@ -256,10 +256,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
                return false;
  
        list_for_each_entry(p, &br->port_list, list) {