]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch
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
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 ---
17 net/bridge/br_stp_if.c | 5 +----
18 1 file changed, 1 insertion(+), 4 deletions(-)
19
20 diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
21 index 808e2b914015..b0ad54384826 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))