kernel: Bump to 4.14.224

[librecmc/librecmc.git] / target / linux / generic / backport-4.14 / 090-net-bridge-add-support-for-port-isolation.patch

diff --git a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
index 6237177a45b3f955d35b661b520a067dae178267..483881f35d24cee8406fc460e5b439a8394f569b 100644 (file)
--- a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
+++ b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
@@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  int br_add_bridge(struct net *net, const char *name);
 --- a/net/bridge/br_sysfs_if.c
 +++ b/net/bridge/br_sysfs_if.c
-@@ -174,6 +174,7 @@ BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
+@@ -177,6 +177,7 @@ 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(broadcast_flood, BR_BCAST_FLOOD);
@@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
-@@ -223,6 +224,7 @@ static const struct brport_attribute *br
+@@ -226,6 +227,7 @@ static const struct brport_attribute *br
        &brport_attr_proxyarp_wifi,
        &brport_attr_multicast_flood,
        &brport_attr_broadcast_flood,