aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-04-03 21:18:41 +0300
committerDavid S. Miller <davem@davemloft.net>2017-04-05 06:53:42 -0700
commit2c099ccbd093ffce056987a227fcc96e6a77b101 (patch)
tree43610bf924af89ce94b4ffefb43642bc1a87a217
parentliquidio: clear the correct memory (diff)
downloadlinux-dev-2c099ccbd093ffce056987a227fcc96e6a77b101.tar.xz
linux-dev-2c099ccbd093ffce056987a227fcc96e6a77b101.zip
net: sched: choke: remove some dead code
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>
-rw-r--r--net/sched/sch_choke.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index 03ce895d7ff5..593183a5b5b5 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -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)