kernel: add missing config symbol after rfkill change

[oweals/openwrt.git] / target / linux / generic / patches-4.4 / 642-bridge_port_isolate.patch

diff --git a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
index 0be8c8fdd861397e2dfe835936d7f371d45e75a7..3ece047317e1c9f97de928f8294925d814e9c0f5 100644 (file)
--- a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: port isolate
 
 Isolating individual bridge ports
@@ -11,8 +11,8 @@ Isolating individual bridge ports
  #define BR_PROXYARP_WIFI      BIT(10)
 +#define BR_ISOLATE_MODE       BIT(11)
  
- /* values as per ieee8021QBridgeFdbAgingTime */
- #define BR_MIN_AGEING_TIME    (10 * HZ)
+ #define BR_DEFAULT_AGEING_TIME        (300 * HZ)
+ 
 --- a/net/bridge/br_sysfs_if.c
 +++ b/net/bridge/br_sysfs_if.c
 @@ -173,6 +173,22 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD
@@ -24,7 +24,7 @@ Isolating individual bridge ports
 +      int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
 +      return sprintf(buf, "%d\n", isolate_mode);
 +}
-+static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++static int store_isolate_mode(struct net_bridge_port *p, unsigned long v)
 +{
 +      if (v)
 +              p->flags |= BR_ISOLATE_MODE;