git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
net
/
sched
/
sch_ingress.c
diff --git
a/net/sched/sch_ingress.c
b/net/sched/sch_ingress.c
index
956c80a
..
4a2b773
100644
(file)
--- a/
net/sched/sch_ingress.c
+++ b/
net/sched/sch_ingress.c
@@
-77,7
+77,7
@@
static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch)
result = tc_classify(skb, p->filter_list, &res);
sch->bstats.packets++;
- sch->bstats.bytes +=
skb->len
;
+ sch->bstats.bytes +=
qdisc_pkt_len(skb)
;
switch (result) {
case TC_ACT_SHOT:
result = TC_ACT_SHOT;