diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-07-04 19:49:32 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 09:45:59 +0100 |
| commit | b06665b2052eac06cb5a2359e1d569cbeca72e91 (patch) | |
| tree | 5292917633738422fc2e1955ac73f5fbe5205ccd | |
| parent | 0291b76af96355625c856bf0128e30bba783f139 (diff) | |
| download | upstream-b06665b2052eac06cb5a2359e1d569cbeca72e91.tar.gz upstream-b06665b2052eac06cb5a2359e1d569cbeca72e91.tar.bz2 upstream-b06665b2052eac06cb5a2359e1d569cbeca72e91.zip | |
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>
(backported from 41a1c1af4bbf18cb5f3a4dfd1fb988317da9aa2d)
| -rw-r--r-- | target/linux/generic/hack-4.14/641-bridge_port_isolate.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-4.9/641-bridge_port_isolate.patch | 4 |
2 files changed, 4 insertions, 4 deletions
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 538dbd16b0..43e71ee2ff 100644 --- 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(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 }; 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 0d0b2c73ff..c545fa17ef 100644 --- 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(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 }; |