kernel: adjust bridge port isolate patch to match upstream attribute naming

Newer kernels have a patch that implements compatible functionality
directly. Adjust the attribute of our own patch in preparation for
dropping it later

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
index 538dbd16b095a83c5709997a09c22cfe27e265d8..43e71ee2ff7ce3719a44c0364008528bd728f5fa 100644 (file)
--- a/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
+++ b/target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
@@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
  BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
  BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
  BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
  BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
  BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);

-+BRPORT_ATTR_FLAG(isolate_mode, BR_ISOLATE_MODE);
++BRPORT_ATTR_FLAG(isolated, BR_ISOLATE_MODE);

  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)


@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        &brport_attr_proxyarp_wifi,
        &brport_attr_multicast_flood,
        &brport_attr_broadcast_flood,
        &brport_attr_proxyarp_wifi,
        &brport_attr_multicast_flood,
        &brport_attr_broadcast_flood,

-+      &brport_attr_isolate_mode,
++      &brport_attr_isolated,

        NULL
  };
  
        NULL
  };
  

diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
index 0d0b2c73ffe73c2999c104bba3d9545be521a99c..c545fa17ef8b47ae43e83a59329364db1f7fd1b0 100644 (file)
--- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
+++ b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch
@@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
  BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
  BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
  BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
  BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
  BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);

-+BRPORT_ATTR_FLAG(isolate_mode, BR_ISOLATE_MODE);
++BRPORT_ATTR_FLAG(isolated, BR_ISOLATE_MODE);

  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)


@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        &brport_attr_proxyarp,
        &brport_attr_proxyarp_wifi,
        &brport_attr_multicast_flood,
        &brport_attr_proxyarp,
        &brport_attr_proxyarp_wifi,
        &brport_attr_multicast_flood,

-+      &brport_attr_isolate_mode,
++      &brport_attr_isolated,

        NULL
  };
  
        NULL
  };
  

diff --git a/target/linux/generic/pending-3.18/642-bridge_port_isolate.patch b/target/linux/generic/pending-3.18/642-bridge_port_isolate.patch
index d231f881b9cac96da6baee3e28b9e6c8b3c97a4d..47f8eb160b2e28cafebd80ee47ad779b1c835dd7 100644 (file)
--- a/target/linux/generic/pending-3.18/642-bridge_port_isolate.patch
+++ b/target/linux/generic/pending-3.18/642-bridge_port_isolate.patch
@@ -15,34 +15,19 @@ Isolating individual bridge ports
        struct bridge_mcast_own_query   ip4_own_query;
 --- a/net/bridge/br_sysfs_if.c
 +++ b/net/bridge/br_sysfs_if.c
        struct bridge_mcast_own_query   ip4_own_query;
 --- a/net/bridge/br_sysfs_if.c
 +++ b/net/bridge/br_sysfs_if.c

-@@ -171,6 +171,22 @@ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLO
+@@ -170,6 +170,7 @@ BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUA
+ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK);

  BRPORT_ATTR_FLAG(learning, BR_LEARNING);
  BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);
  BRPORT_ATTR_FLAG(learning, BR_LEARNING);
  BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);

++BRPORT_ATTR_FLAG(isolated, BR_ISOLATE_MODE);

  
  

-+static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
-+{
-+      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)
-+{
-+      if (v)
-+              p->flags |= BR_ISOLATE_MODE;
-+      else
-+              p->flags &= ~BR_ISOLATE_MODE;
-+      return 0;
-+}
-+static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
-+                 show_isolate_mode, store_isolate_mode);
-+

  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)

- {
-@@ -213,6 +229,7 @@ static const struct brport_attribute *br
+@@ -213,6 +214,7 @@ static const struct brport_attribute *br

        &brport_attr_multicast_router,
        &brport_attr_multicast_fast_leave,
  #endif
        &brport_attr_multicast_router,
        &brport_attr_multicast_fast_leave,
  #endif

-+      &brport_attr_isolate_mode,
++      &brport_attr_isolated,

        NULL
  };
  
        NULL
  };