Skip to contentSkip to conversation

net: sched: choke: remove some dead code

PATCH Applied Dan Carpenter 3 participants 3 messages Apr 3, 2017 – Apr 5, 2017

Subsystems (4)
Networking Network drivers Kernel janitors Traffic control (tc)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
net/sched/sch_choke.c +0 -6
index 040625fdc82b..f11f8732b0d5 100644
@@ -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)