git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
sched
/
sch_sfq.c
diff --git
a/net/sched/sch_sfq.c
b/net/sched/sch_sfq.c
index
ac668b0
..
8734bb7
100644
(file)
--- a/
net/sched/sch_sfq.c
+++ b/
net/sched/sch_sfq.c
@@
-13,7
+13,7
@@
#include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
@@
-227,7
+227,7
@@
static unsigned int sfq_drop(struct Qdisc *sch)
kfree_skb(skb);
sfq_dec(q, x);
sch->q.qlen--;
kfree_skb(skb);
sfq_dec(q, x);
sch->q.qlen--;
- sch->stats.drops++;
+ sch->
q
stats.drops++;
return len;
}
return len;
}
@@
-243,7
+243,7
@@
static unsigned int sfq_drop(struct Qdisc *sch)
sfq_dec(q, d);
sch->q.qlen--;
q->ht[q->hash[d]] = SFQ_DEPTH;
sfq_dec(q, d);
sch->q.qlen--;
q->ht[q->hash[d]] = SFQ_DEPTH;
- sch->stats.drops++;
+ sch->
q
stats.drops++;
return len;
}
return len;
}
@@
-276,8
+276,8
@@
sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
}
}
if (++sch->q.qlen < q->limit-1) {
}
}
if (++sch->q.qlen < q->limit-1) {
- sch->stats.bytes += skb->len;
- sch->stats.packets++;
+ sch->
b
stats.bytes += skb->len;
+ sch->
b
stats.packets++;
return 0;
}
return 0;
}
@@
-310,10
+310,12
@@
sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
q->tail = x;
}
}
q->tail = x;
}
}
- if (++sch->q.qlen < q->limit - 1)
+ if (++sch->q.qlen < q->limit - 1) {
+ sch->qstats.requeues++;
return 0;
return 0;
+ }
- sch->stats.drops++;
+ sch->
q
stats.drops++;
sfq_drop(sch);
return NET_XMIT_CN;
}
sfq_drop(sch);
return NET_XMIT_CN;
}