diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /net/sched/sch_prio.c | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'net/sched/sch_prio.c')
| -rw-r--r-- | net/sched/sch_prio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index eac197610edf..a6697c686c7f 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
| @@ -113,11 +113,11 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch) | |||
| 113 | if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) { | 113 | if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) { |
| 114 | sch->q.qlen++; | 114 | sch->q.qlen++; |
| 115 | sch->qstats.requeues++; | 115 | sch->qstats.requeues++; |
| 116 | return 0; | 116 | return NET_XMIT_SUCCESS; |
| 117 | } | 117 | } |
| 118 | if (net_xmit_drop_count(ret)) | 118 | if (net_xmit_drop_count(ret)) |
| 119 | sch->qstats.drops++; | 119 | sch->qstats.drops++; |
| 120 | return NET_XMIT_DROP; | 120 | return ret; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | 123 | ||