kernel: adjust bridge port isolate patch to match upstream attribute naming
authorFelix Fietkau <nbd@nbd.name>
Wed, 4 Jul 2018 17:49:32 +0000 (19:49 +0200)
committerJo-Philipp Wich <jo@mein.io>
Tue, 18 Dec 2018 08:45:59 +0000 (09:45 +0100)
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>
(backported from 41a1c1af4bbf18cb5f3a4dfd1fb988317da9aa2d)

target/linux/generic/hack-4.14/641-bridge_port_isolate.patch
target/linux/generic/hack-4.9/641-bridge_port_isolate.patch

index 538dbd1..43e71ee 100644 (file)
@@ -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(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)
@@ -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_isolate_mode,
++      &brport_attr_isolated,
        NULL
  };
  
index 0d0b2c7..c545fa1 100644 (file)
@@ -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(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)
@@ -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_isolate_mode,
++      &brport_attr_isolated,
        NULL
  };