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> SVN-Revision: 39955
This commit is contained in:
parent
f2689dba28
commit
479b0c82a2
3 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue