re-add patch bridge-patch.diff

Default bridge changes MAC dynamically using smallest MAC of all
connected ports (for no real reason). To avoid problems with ARP
we simply use the MAC of the first connected port.

diff --git a/Makefile b/Makefile
index 534cfe058730207bb0721b972f629a9059ba1711..13b1384dc5f33a9e8cfe3b3c7cf6c54618f78600 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        #cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.8.diff
        #cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab083
        #cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
-       #cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
+       cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
        #cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        #cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch

diff --git a/bridge-patch.diff b/bridge-patch.diff
new file mode 100644 (file)
index 0000000..648042e
--- /dev/null
+++ b/bridge-patch.diff
@@ -0,0 +1,14 @@
+--- linux-2.6-3.10.0/net/bridge/br_stp_if.c.orig       2013-11-26 22:20:20.000000000 +0100
++++ linux-2.6-3.10.0/net/bridge/br_stp_if.c    2013-12-17 08:42:10.004428223 +0100
+@@ -228,10 +228,7 @@
+               return false;
+ 
+       list_for_each_entry(p, &br->port_list, list) {
+-              if (addr == br_mac_zero ||
+-                  memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
+-                      addr = p->dev->dev_addr;
+-
++              addr = p->dev->dev_addr;
+       }
+ 
+       if (ether_addr_equal(br->bridge_id.addr, addr))