From 479b0c82a207c4633e225b0bd809fd0fe5bdd3b2 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 19 Mar 2014 14:26:48 +0000
Subject: 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
---
 target/linux/generic/patches-3.12/642-bridge_port_isolate.patch | 2 +-
 target/linux/generic/patches-3.13/642-bridge_port_isolate.patch | 2 +-
 target/linux/generic/patches-3.14/642-bridge_port_isolate.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'target/linux/generic')

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
--- 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
--- 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
--- 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;
-- 
cgit v1.1