aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-21 21:30:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-21 21:30:30 +0000
commit18fe6ccc9f7c0c4819090c53bbb2023c925682ae (patch)
tree3e184d50e25e7ea2ff4f8f3d575ff53e8a98a9f1 /target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
parentfa767eb829d75645c09917576613a37ca0d14652 (diff)
downloadmaster-187ad058-18fe6ccc9f7c0c4819090c53bbb2023c925682ae.tar.gz
master-187ad058-18fe6ccc9f7c0c4819090c53bbb2023c925682ae.tar.bz2
master-187ad058-18fe6ccc9f7c0c4819090c53bbb2023c925682ae.zip
[kernel] refresh 3.3 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33887 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch')
-rw-r--r--target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch b/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
index 2e6b219446..6699e98f76 100644
--- a/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
+++ b/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
@@ -16,11 +16,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_fq_codel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
-index 9fc1c62..4e606fc 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -191,7 +191,6 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+@@ -191,7 +191,6 @@ static int fq_codel_enqueue(struct sk_bu
if (list_empty(&flow->flowchain)) {
list_add_tail(&flow->flowchain, &q->new_flows);
@@ -28,7 +26,7 @@ index 9fc1c62..4e606fc 100644
q->new_flow_count++;
flow->deficit = q->quantum;
flow->dropped = 0;
-@@ -418,6 +417,7 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt)
+@@ -418,6 +417,7 @@ static int fq_codel_init(struct Qdisc *s
struct fq_codel_flow *flow = q->flows + i;
INIT_LIST_HEAD(&flow->flowchain);
@@ -36,6 +34,3 @@ index 9fc1c62..4e606fc 100644
}
}
if (sch->limit >= 1)
---
-1.7.9.5
-