net: sched: choke: remove some dead code
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 3 Apr 2017 18:18:41 +0000 (21:18 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Apr 2017 13:53:42 +0000 (06:53 -0700)
We accidentally left this dead code behind after commit 5952fde10c35
("net: sched: choke: remove dead filter classify code").

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_choke.c

index 03ce895d7ff51291ac30291d510686e168aad8e8..593183a5b5b59013bfe7c59ce9e143879b793c4c 100644 (file)
@@ -223,7 +223,6 @@ static bool choke_match_random(const struct choke_sched_data *q,
 static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                         struct sk_buff **to_free)
 {
-       int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
        struct choke_sched_data *q = qdisc_priv(sch);
        const struct red_parms *p = &q->parms;
 
@@ -290,11 +289,6 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 congestion_drop:
        qdisc_drop(skb, sch, to_free);
        return NET_XMIT_CN;
-
-       if (ret & __NET_XMIT_BYPASS)
-               qdisc_qstats_drop(sch);
-       __qdisc_drop(skb, to_free);
-       return ret;
 }
 
 static struct sk_buff *choke_dequeue(struct Qdisc *sch)