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