diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-24 05:34:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:11:18 +0100 |
| commit | 4b3550ef530cfc153fa91f0b37cbda448bad11c6 (patch) | |
| tree | 02aba7497298f220629af8e47f48e56df86d428f /net/sched/cls_route.c | |
| parent | [NET_SCHED]: Propagate nla_parse return value (diff) | |
| download | linux-4b3550ef530cfc153fa91f0b37cbda448bad11c6.tar.xz linux-4b3550ef530cfc153fa91f0b37cbda448bad11c6.zip | |
[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.c | 9 |
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, { struct route4_filter *f = (struct route4_filter*)fh; unsigned char *b = skb_tail_pointer(skb); - struct nlattr *nla; + struct nlattr *nest; u32 id; if (f == NULL) @@ -559,8 +559,9 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh, t->tcm_handle = f->handle; - nla = (struct nlattr*)b; - NLA_PUT(skb, TCA_OPTIONS, 0, NULL); + nest = nla_nest_start(skb, TCA_OPTIONS); + if (nest == NULL) + goto nla_put_failure; if (!(f->handle&0x8000)) { id = f->id&0xFF; @@ -579,7 +580,7 @@ static int route4_dump(struct tcf_proto *tp, unsigned long fh, if (tcf_exts_dump(skb, &f->exts, &route_ext_map) < 0) goto nla_put_failure; - nla->nla_len = skb_tail_pointer(skb) - b; + nla_nest_end(skb, nest); if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0) goto nla_put_failure; |