diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /net/sched/cls_basic.c | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
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: |