Explorar o código

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 <[email protected]>

SVN-Revision: 39955
Felix Fietkau %!s(int64=11) %!d(string=hai) anos
pai
achega
479b0c82a2

+ 1 - 1
target/linux/generic/patches-3.12/642-bridge_port_isolate.patch

@@ -4,7 +4,7 @@
  #define BR_ADMIN_COST		0x00000010
  #define BR_ADMIN_COST		0x00000010
  #define BR_LEARNING		0x00000020
  #define BR_LEARNING		0x00000020
  #define BR_FLOOD		0x00000040
  #define BR_FLOOD		0x00000040
-+#define BR_ISOLATE_MODE	0x00000020
++#define BR_ISOLATE_MODE	0x00000080
  
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  	struct bridge_mcast_query	ip4_query;
  	struct bridge_mcast_query	ip4_query;

+ 1 - 1
target/linux/generic/patches-3.13/642-bridge_port_isolate.patch

@@ -4,7 +4,7 @@
  #define BR_ADMIN_COST		0x00000010
  #define BR_ADMIN_COST		0x00000010
  #define BR_LEARNING		0x00000020
  #define BR_LEARNING		0x00000020
  #define BR_FLOOD		0x00000040
  #define BR_FLOOD		0x00000040
-+#define BR_ISOLATE_MODE	0x00000020
++#define BR_ISOLATE_MODE	0x00000080
  
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  	struct bridge_mcast_query	ip4_query;
  	struct bridge_mcast_query	ip4_query;

+ 1 - 1
target/linux/generic/patches-3.14/642-bridge_port_isolate.patch

@@ -4,7 +4,7 @@
  #define BR_ADMIN_COST		0x00000010
  #define BR_ADMIN_COST		0x00000010
  #define BR_LEARNING		0x00000020
  #define BR_LEARNING		0x00000020
  #define BR_FLOOD		0x00000040
  #define BR_FLOOD		0x00000040
-+#define BR_ISOLATE_MODE	0x00000020
++#define BR_ISOLATE_MODE	0x00000080
  
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  	struct bridge_mcast_query	ip4_query;
  	struct bridge_mcast_query	ip4_query;