diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-23 20:34:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:18 -0800 |
| commit | 4b3550ef530cfc153fa91f0b37cbda448bad11c6 (patch) | |
| tree | 02aba7497298f220629af8e47f48e56df86d428f /net/sched/ematch.c | |
| parent | cee63723b358e594225e812d6e14a2a0abfd5c88 (diff) | |
| download | linux-4b3550ef530cfc153fa91f0b37cbda448bad11c6.tar.bz2 | |
[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/ematch.c')
| -rw-r--r-- | net/sched/ematch.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index d2b480f01a40..daa9c4e7e81d 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c @@ -436,14 +436,18 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv) { int i; u8 *tail; - struct nlattr *top_start = (struct nlattr *)skb_tail_pointer(skb); + struct nlattr *top_start; struct nlattr *list_start; - NLA_PUT(skb, tlv, 0, NULL); + top_start = nla_nest_start(skb, tlv); + if (top_start == NULL) + goto nla_put_failure; + NLA_PUT(skb, TCA_EMATCH_TREE_HDR, sizeof(tree->hdr), &tree->hdr); - list_start = (struct nlattr *)skb_tail_pointer(skb); - NLA_PUT(skb, TCA_EMATCH_TREE_LIST, 0, NULL); + list_start = nla_nest_start(skb, TCA_EMATCH_TREE_LIST); + if (list_start == NULL) + goto nla_put_failure; tail = skb_tail_pointer(skb); for (i = 0; i < tree->hdr.nmatches; i++) { @@ -470,8 +474,8 @@ int tcf_em_tree_dump(struct sk_buff *skb, struct tcf_ematch_tree *tree, int tlv) match_start->nla_len = tail - (u8 *)match_start; } - list_start->nla_len = tail - (u8 *)list_start; - top_start->nla_len = tail - (u8 *)top_start; + nla_nest_end(skb, list_start); + nla_nest_end(skb, top_start); return 0; |