]> git.proxmox.com Git - pve-kernel.git/blame - patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
warn when non-RETPOLINED module gets loaded
[pve-kernel.git] / patches / kernel / 0002-bridge-keep-MAC-of-first-assigned-port.patch
CommitLineData
59d5af67 1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
b9e76370
FG
2From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
3Date: Thu, 14 Sep 2017 11:02:18 +0200
59d5af67 4Subject: [PATCH] bridge: keep MAC of first assigned port
b9e76370
FG
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9original commit message:
10
11Default bridge changes MAC dynamically using smallest MAC of all
12connected ports (for no real reason). To avoid problems with ARP
13we simply use the MAC of the first connected port.
14
15Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
16---
17 net/bridge/br_stp_if.c | 5 +----
18 1 file changed, 1 insertion(+), 4 deletions(-)
19
20diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
21index 89110319ef0f..5e73fff65f47 100644
22--- a/net/bridge/br_stp_if.c
23+++ b/net/bridge/br_stp_if.c
24@@ -259,10 +259,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
25 return false;
26
27 list_for_each_entry(p, &br->port_list, list) {
28- if (addr == br_mac_zero ||
29- memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
30- addr = p->dev->dev_addr;
31-
32+ addr = p->dev->dev_addr;
33 }
34
35 if (ether_addr_equal(br->bridge_id.addr, addr))
36--
777ee9fe 372.14.2
b9e76370 38