Skip to content

Commit

Permalink
net: Use NET_XMIT_SUCCESS where possible.
Browse files Browse the repository at this point in the history
This is based on work originally done by Patric McHardy.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
greearb authored and davem330 committed Aug 10, 2010
1 parent 06d88e4 commit 9871e50
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions net/sched/sch_atm.c
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
}

ret = qdisc_enqueue(skb, flow->q);
if (ret != 0) {
if (ret != NET_XMIT_SUCCESS) {
drop: __maybe_unused
if (net_xmit_drop_count(ret)) {
sch->qstats.drops++;
Expand All @@ -442,7 +442,7 @@ drop: __maybe_unused
*/
if (flow == &p->link) {
sch->q.qlen++;
return 0;
return NET_XMIT_SUCCESS;
}
tasklet_schedule(&p->task);
return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
Expand Down
2 changes: 1 addition & 1 deletion net/sched/sch_sfq.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
if (++sch->q.qlen <= q->limit) {
sch->bstats.bytes += qdisc_pkt_len(skb);
sch->bstats.packets++;
return 0;
return NET_XMIT_SUCCESS;
}

sfq_drop(sch);
Expand Down
4 changes: 2 additions & 2 deletions net/sched/sch_tbf.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
return qdisc_reshape_fail(skb, sch);

ret = qdisc_enqueue(skb, q->qdisc);
if (ret != 0) {
if (ret != NET_XMIT_SUCCESS) {
if (net_xmit_drop_count(ret))
sch->qstats.drops++;
return ret;
Expand All @@ -136,7 +136,7 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
sch->q.qlen++;
sch->bstats.bytes += qdisc_pkt_len(skb);
sch->bstats.packets++;
return 0;
return NET_XMIT_SUCCESS;
}

static unsigned int tbf_drop(struct Qdisc* sch)
Expand Down
2 changes: 1 addition & 1 deletion net/sched/sch_teql.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ teql_enqueue(struct sk_buff *skb, struct Qdisc* sch)
__skb_queue_tail(&q->q, skb);
sch->bstats.bytes += qdisc_pkt_len(skb);
sch->bstats.packets++;
return 0;
return NET_XMIT_SUCCESS;
}

kfree_skb(skb);
Expand Down

0 comments on commit 9871e50

Please sign in to comment.