0002-bridge-keep-MAC-of-first-assigned-port.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From fcf6881a32da892f831d277e13f8a30dfaa280c4 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <[email protected]>
  3. Date: Thu, 14 Sep 2017 11:02:18 +0200
  4. Subject: [PATCH 02/10] 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. original commit message:
  9. Default bridge changes MAC dynamically using smallest MAC of all
  10. connected ports (for no real reason). To avoid problems with ARP
  11. we simply use the MAC of the first connected port.
  12. Signed-off-by: Fabian Grünbichler <[email protected]>
  13. ---
  14. net/bridge/br_stp_if.c | 5 +----
  15. 1 file changed, 1 insertion(+), 4 deletions(-)
  16. diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
  17. index 89110319ef0f..5e73fff65f47 100644
  18. --- a/net/bridge/br_stp_if.c
  19. +++ b/net/bridge/br_stp_if.c
  20. @@ -259,10 +259,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
  21. return false;
  22. list_for_each_entry(p, &br->port_list, list) {
  23. - if (addr == br_mac_zero ||
  24. - memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
  25. - addr = p->dev->dev_addr;
  26. -
  27. + addr = p->dev->dev_addr;
  28. }
  29. if (ether_addr_equal(br->bridge_id.addr, addr))
  30. --
  31. 2.14.2