dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

net: sched: factorize code (qdisc_drop()) 

Use qdisc_drop() helper where possible.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2012-05-04 04:37:21 +00:00 committed by David S. Miller
parent 041441d0f0
commit 1704575519
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sched/sch_choke.c
View File

@ -332,15 +332,13 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch)
} }
q->stats.pdrop++; q->stats.pdrop++;
sch->qstats.drops++; return qdisc_drop(skb, sch);
kfree_skb(skb);
return NET_XMIT_DROP;
congestion_drop: congestion_drop:
qdisc_drop(skb, sch); qdisc_drop(skb, sch);
return NET_XMIT_CN; return NET_XMIT_CN;
other_drop: other_drop:
if (ret & __NET_XMIT_BYPASS) if (ret & __NET_XMIT_BYPASS)
sch->qstats.drops++; sch->qstats.drops++;
kfree_skb(skb); kfree_skb(skb);

3
net/sched/sch_dsmark.c
View File

@ -265,8 +265,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
return NET_XMIT_SUCCESS; return NET_XMIT_SUCCESS;
drop: drop:
kfree_skb(skb); qdisc_drop(skb, sch);
sch->qstats.drops++;
return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
} }

4
net/sched/sch_htb.c
View File

@ -558,9 +558,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
__skb_queue_tail(&q->direct_queue, skb); __skb_queue_tail(&q->direct_queue, skb);
q->direct_pkts++; q->direct_pkts++;
} else { } else {
kfree_skb(skb); return qdisc_drop(skb, sch);
sch->qstats.drops++;
return NET_XMIT_DROP;
} }
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
} else if (!cl) { } else if (!cl) {

4
net/sched/sch_teql.c
View File

@ -88,9 +88,7 @@ teql_enqueue(struct sk_buff *skb, struct Qdisc *sch)
return NET_XMIT_SUCCESS; return NET_XMIT_SUCCESS;
} }
kfree_skb(skb); return qdisc_drop(skb, sch);
sch->qstats.drops++;
return NET_XMIT_DROP;
} }
static struct sk_buff * static struct sk_buff *