summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2005-11-05 23:14:18 +0300
committerThomas Graf <tgr@axs.localdomain>2005-11-06 00:02:27 +0300
commitc3b553cdaf50ce915bcd995fa8ec2905f227de64 (patch)
treeb85ff8cb0b93499259c59f9d5c57f31ab53b937b /net
parent301d063c2915e8307e3d128245d8a393ad776539 (diff)
downloadlinux-c3b553cdaf50ce915bcd995fa8ec2905f227de64.tar.xz
[PKT_SCHED]: GRED: Report congestion related drops as NET_XMIT_CN
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_gred.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 50f184cd7f1f..f7c6c0359ce5 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -219,12 +219,12 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
case RED_PROB_MARK:
sch->qstats.overlimits++;
q->stats.prob_drop++;
- goto drop;
+ goto congestion_drop;
case RED_HARD_MARK:
sch->qstats.overlimits++;
q->stats.forced_drop++;
- goto drop;
+ goto congestion_drop;
}
if (q->backlog + skb->len <= q->limit) {
@@ -242,6 +242,11 @@ drop:
kfree_skb(skb);
sch->qstats.drops++;
return NET_XMIT_DROP;
+
+congestion_drop:
+ kfree_skb(skb);
+ sch->qstats.drops++;
+ return NET_XMIT_CN;
}
static int