kernel: revert fq_codel quantum override to prevent it from causing too much cpu...

[lede.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 a47dd6748d3637ead997f47ed5a8cf59c70865da..13f84ae13eb882f42754820b96d3ff76718ab310 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,3 +1,8 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] bridge: port isolate
+
+Isolating individual bridge ports
+---
 --- a/include/linux/if_bridge.h
 +++ b/include/linux/if_bridge.h
 @@ -45,6 +45,7 @@ struct br_ip_list {
@@ -56,7 +61,7 @@
                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)
  {
@@ -65,7 +70,7 @@
                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),
@@ -74,7 +79,7 @@
  {
        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) {
@@ -83,7 +88,7 @@
                /* 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)
  {