* [PATCH -next] net: sched: choke: remove some dead code
@ 2017-04-03 18:18 Dan Carpenter
2017-04-03 18:37 ` Jiri Pirko
2017-04-05 13:54 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2017-04-03 18:18 UTC (permalink / raw)
To: Jamal Hadi Salim, Jiri Pirko; +Cc: David S. Miller, netdev, kernel-janitors
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>
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index 040625fdc82b..f11f8732b0d5 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)
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH -next] net: sched: choke: remove some dead code
2017-04-03 18:18 [PATCH -next] net: sched: choke: remove some dead code Dan Carpenter
@ 2017-04-03 18:37 ` Jiri Pirko
2017-04-05 13:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2017-04-03 18:37 UTC (permalink / raw)
To: Dan Carpenter
Cc: Jamal Hadi Salim, Jiri Pirko, David S. Miller, netdev,
kernel-janitors
Mon, Apr 03, 2017 at 08:18:41PM CEST, dan.carpenter@oracle.com wrote:
>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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH -next] net: sched: choke: remove some dead code
2017-04-03 18:18 [PATCH -next] net: sched: choke: remove some dead code Dan Carpenter
2017-04-03 18:37 ` Jiri Pirko
@ 2017-04-05 13:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-04-05 13:54 UTC (permalink / raw)
To: dan.carpenter; +Cc: jhs, jiri, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 3 Apr 2017 21:18:41 +0300
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-05 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-03 18:18 [PATCH -next] net: sched: choke: remove some dead code Dan Carpenter
2017-04-03 18:37 ` Jiri Pirko
2017-04-05 13:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).