projects / openwrt / staging / yousong.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f2689db)
kernel/generic: fix define in 642-bridge_port_isolate.patch
authorFelix Fietkau <nbd@openwrt.org>
Wed, 19 Mar 2014 14:26:48 +0000 (14:26 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 19 Mar 2014 14:26:48 +0000 (14:26 +0000)
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>
SVN-Revision: 39955

target/linux/generic/patches-3.12/642-bridge_port_isolate.patch patch | blob | history
target/linux/generic/patches-3.13/642-bridge_port_isolate.patch patch | blob | history
target/linux/generic/patches-3.14/642-bridge_port_isolate.patch patch | blob | history

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 be9b8f1058c95f5b239476b184ead05be2f4a222..dd330b2923f3090a19b0f41b4cb7330f5a5b9952 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 be9b8f1058c95f5b239476b184ead05be2f4a222..dd330b2923f3090a19b0f41b4cb7330f5a5b9952 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 1d6b75c01433bc5a0230937f5ead68534425e2e9..5c5662d808681cd3d59583b593a47aaa7cbe0349 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;
Yousong Zhou staging tree