ar71xx: add revision detection for D-Link DIR-505 A1/A2

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

diff --git a/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch b/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch
index 06c368d1f0628d5fa45b6ec55882e6a3fe038b2a..d7ae041b257e00f64de50e31d38e3ab02e2b1b75 100644 (file)
--- a/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-4.1/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
@@ -61,7 +61,7 @@ Isolating individual bridge ports
                skb = NULL;
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
-@@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(br_deliver);
+@@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(br_deliver);
  /* called with rcu_read_lock */
  void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
  {
@@ -70,7 +70,7 @@ Isolating individual bridge ports
                if (skb0)
                        deliver_clone(to, skb, __br_forward);
                else
-@@ -174,7 +174,7 @@ static void br_flood(struct net_bridge *
+@@ -175,7 +175,7 @@ static void br_flood(struct net_bridge *
                     struct sk_buff *skb0,
                     void (*__packet_hook)(const struct net_bridge_port *p,
                                           struct sk_buff *skb),
@@ -79,7 +79,7 @@ Isolating individual bridge ports
  {
        struct net_bridge_port *p;
        struct net_bridge_port *prev;
-@@ -182,6 +182,8 @@ static void br_flood(struct net_bridge *
+@@ -183,6 +183,8 @@ static void br_flood(struct net_bridge *
        prev = NULL;
  
        list_for_each_entry_rcu(p, &br->port_list, list) {
@@ -88,7 +88,7 @@ Isolating individual bridge ports
                /* Do not flood unicast traffic to ports that turn it off */
                if (unicast && !(p->flags & BR_FLOOD))
                        continue;
-@@ -216,14 +218,14 @@ out:
+@@ -217,14 +219,14 @@ out:
  /* called with rcu_read_lock */
  void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)
  {