aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/cls_route.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-23 23:34:11 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:11:18 -0500
commit4b3550ef530cfc153fa91f0b37cbda448bad11c6 (patch)
tree02aba7497298f220629af8e47f48e56df86d428f /net/sched/cls_route.c
parentcee63723b358e594225e812d6e14a2a0abfd5c88 (diff)
[NET_SCHED]: Use nla_nest_start/nla_nest_end
Use nla_nest_start/nla_nest_end for dumping nested attributes. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_route.c')
-rw-r--r--net/sched/cls_route.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 3aa8109aa3ce..1ce1f3623d65 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -551,7 +551,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh,
551{ 551{
552 struct route4_filter *f = (struct route4_filter*)fh; 552 struct route4_filter *f = (struct route4_filter*)fh;
553 unsigned char *b = skb_tail_pointer(skb); 553 unsigned char *b = skb_tail_pointer(skb);
554 struct nlattr *nla; 554 struct nlattr *nest;
555 u32 id; 555 u32 id;
556 556
557 if (f == NULL) 557 if (f == NULL)
@@ -559,8 +559,9 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh,
559 559
560 t->tcm_handle = f->handle; 560 t->tcm_handle = f->handle;
561 561
562 nla = (struct nlattr*)b; 562 nest = nla_nest_start(skb, TCA_OPTIONS);
563 NLA_PUT(skb, TCA_OPTIONS, 0, NULL); 563 if (nest == NULL)
564 goto nla_put_failure;
564 565
565 if (!(f->handle&0x8000)) { 566 if (!(f->handle&0x8000)) {
566 id = f->id&0xFF; 567 id = f->id&0xFF;
@@ -579,7 +580,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh,
579 if (tcf_exts_dump(skb, &f->exts, &route_ext_map) < 0) 580 if (tcf_exts_dump(skb, &f->exts, &route_ext_map) < 0)
580 goto nla_put_failure; 581 goto nla_put_failure;
581 582
582 nla->nla_len = skb_tail_pointer(skb) - b; 583 nla_nest_end(skb, nest);
583 584
584 if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0) 585 if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0)
585 goto nla_put_failure; 586 goto nla_put_failure;