From 42f0a5f955ab10b237ff0b29e5c1b8d6a446f957 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 25 Aug 2011 06:21:32 +0000 Subject: [PATCH] --- yaml --- r: 265562 b: refs/heads/master c: 363437f40a23bacdead80bb80d08d8193a20cfce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/sch_sfb.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 66e21c33a25e..35600776e313 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18cf1248eca3f1fc38e12b314a6cadd286260e65 +refs/heads/master: 363437f40a23bacdead80bb80d08d8193a20cfce diff --git a/trunk/net/sched/sch_sfb.c b/trunk/net/sched/sch_sfb.c index 0a833d0c1f61..e83c272c0325 100644 --- a/trunk/net/sched/sch_sfb.c +++ b/trunk/net/sched/sch_sfb.c @@ -287,6 +287,12 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) u32 r, slot, salt, sfbhash; int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; + if (unlikely(sch->q.qlen >= q->limit)) { + sch->qstats.overlimits++; + q->stats.queuedrop++; + goto drop; + } + if (q->rehash_interval > 0) { unsigned long limit = q->rehash_time + q->rehash_interval; @@ -332,12 +338,9 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) slot ^= 1; sfb_skb_cb(skb)->hashes[slot] = 0; - if (unlikely(minqlen >= q->max || sch->q.qlen >= q->limit)) { + if (unlikely(minqlen >= q->max)) { sch->qstats.overlimits++; - if (minqlen >= q->max) - q->stats.bucketdrop++; - else - q->stats.queuedrop++; + q->stats.bucketdrop++; goto drop; }