diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-19 17:51:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 17:51:37 -0500 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /net/sched/act_csum.c | |
| parent | f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (diff) | |
| parent | a5db219f4cf9f67995eabd53b81a1232c82f5852 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'net/sched/act_csum.c')
| -rw-r--r-- | net/sched/act_csum.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c index 67dc7ce9b63a..83ddfc07e45d 100644 --- a/net/sched/act_csum.c +++ b/net/sched/act_csum.c | |||
| @@ -508,8 +508,7 @@ static int tcf_csum(struct sk_buff *skb, | |||
| 508 | 508 | ||
| 509 | spin_lock(&p->tcf_lock); | 509 | spin_lock(&p->tcf_lock); |
| 510 | p->tcf_tm.lastuse = jiffies; | 510 | p->tcf_tm.lastuse = jiffies; |
| 511 | p->tcf_bstats.bytes += qdisc_pkt_len(skb); | 511 | bstats_update(&p->tcf_bstats, skb); |
| 512 | p->tcf_bstats.packets++; | ||
| 513 | action = p->tcf_action; | 512 | action = p->tcf_action; |
| 514 | update_flags = p->update_flags; | 513 | update_flags = p->update_flags; |
| 515 | spin_unlock(&p->tcf_lock); | 514 | spin_unlock(&p->tcf_lock); |