Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux.git] / net / sched / sch_fq_codel.c

diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index 9edd0f4950015939828c97974c29757d90c6e07c..c261c0a1886824ca38e8fb4297f9ca23a4c4863a 100644 (file)
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -285,7 +285,6 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)
        struct sk_buff *skb;
        struct fq_codel_flow *flow;
        struct list_head *head;
-       u32 prev_drop_count, prev_ecn_mark;
 
 begin:
        head = &q->new_flows;
@@ -302,9 +301,6 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)
                goto begin;
        }
 
-       prev_drop_count = q->cstats.drop_count;
-       prev_ecn_mark = q->cstats.ecn_mark;
-
        skb = codel_dequeue(sch, &sch->qstats.backlog, &q->cparams,
                            &flow->cvars, &q->cstats, qdisc_pkt_len,
                            codel_get_enqueue_time, drop_func, dequeue_func);