diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-19 14:26:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-19 14:26:48 +0000 |
| commit | fd9fb8597255a3c4a2fc78c236f376b131815ca5 (patch) | |
| tree | 894ce238e67088c74d7a89146657b1a2b8f4c864 /target | |
| parent | c0631e4aa54cbcd8ff15d87df23f0a432787049b (diff) | |
| download | master-187ad058-fd9fb8597255a3c4a2fc78c236f376b131815ca5.tar.gz master-187ad058-fd9fb8597255a3c4a2fc78c236f376b131815ca5.tar.bz2 master-187ad058-fd9fb8597255a3c4a2fc78c236f376b131815ca5.zip | |
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
Diffstat (limited to 'target')
3 files changed, 3 insertions, 3 deletions
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 be9b8f1058..dd330b2923 100644 --- 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 be9b8f1058..dd330b2923 100644 --- 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 1d6b75c014..5c5662d808 100644 --- 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; |