diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
| commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
| tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /net/sched/cls_basic.c | |
| parent | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff) | |
| parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
Diffstat (limited to 'net/sched/cls_basic.c')
| -rw-r--r-- | net/sched/cls_basic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index efd4f95fd050..f23d9155b1ef 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c | |||
| @@ -268,6 +268,10 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh, | |||
| 268 | goto nla_put_failure; | 268 | goto nla_put_failure; |
| 269 | 269 | ||
| 270 | nla_nest_end(skb, nest); | 270 | nla_nest_end(skb, nest); |
| 271 | |||
| 272 | if (tcf_exts_dump_stats(skb, &f->exts, &basic_ext_map) < 0) | ||
| 273 | goto nla_put_failure; | ||
| 274 | |||
| 271 | return skb->len; | 275 | return skb->len; |
| 272 | 276 | ||
| 273 | nla_put_failure: | 277 | nla_put_failure: |