kernel/generic: fix define in 642-bridge_port_isolate.patch

Patch 642-bridge_port_isolate.patch needs to be updated
for kernels 3.12, 3.13 and 3.14 as the define for BR_ISOLATE_MODE
conflicts with BR_LEARNING

Signed-off-by: Jonas Eymann <j.eymann@gmx.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39955 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch
index be9b8f1..dd330b2 100644 (file)
--- a/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch
@@ -4,7 +4,7 @@
  #define BR_ADMIN_COST         0x00000010
  #define BR_LEARNING           0x00000020
  #define BR_FLOOD              0x00000040
-+#define BR_ISOLATE_MODE       0x00000020
++#define BR_ISOLATE_MODE       0x00000080
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
        struct bridge_mcast_query       ip4_query;

diff --git a/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch
index be9b8f1..dd330b2 100644 (file)
--- a/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch
@@ -4,7 +4,7 @@
  #define BR_ADMIN_COST         0x00000010
  #define BR_LEARNING           0x00000020
  #define BR_FLOOD              0x00000040
-+#define BR_ISOLATE_MODE       0x00000020
++#define BR_ISOLATE_MODE       0x00000080
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
        struct bridge_mcast_query       ip4_query;

diff --git a/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch
index 1d6b75c..5c5662d 100644 (file)
--- a/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch
@@ -4,7 +4,7 @@
  #define BR_ADMIN_COST         0x00000010
  #define BR_LEARNING           0x00000020
  #define BR_FLOOD              0x00000040
-+#define BR_ISOLATE_MODE       0x00000020
++#define BR_ISOLATE_MODE       0x00000080
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
        struct bridge_mcast_query       ip4_query;