diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-23 23:34:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:18 -0500 |
commit | 4b3550ef530cfc153fa91f0b37cbda448bad11c6 (patch) | |
tree | 02aba7497298f220629af8e47f48e56df86d428f /net/sched/sch_tbf.c | |
parent | cee63723b358e594225e812d6e14a2a0abfd5c88 (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/sch_tbf.c')
-rw-r--r-- | net/sched/sch_tbf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index f9b1543e3d76..b7a185dc3def 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c | |||
@@ -375,12 +375,12 @@ static void tbf_destroy(struct Qdisc *sch) | |||
375 | static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) | 375 | static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) |
376 | { | 376 | { |
377 | struct tbf_sched_data *q = qdisc_priv(sch); | 377 | struct tbf_sched_data *q = qdisc_priv(sch); |
378 | unsigned char *b = skb_tail_pointer(skb); | 378 | struct nlattr *nest; |
379 | struct nlattr *nla; | ||
380 | struct tc_tbf_qopt opt; | 379 | struct tc_tbf_qopt opt; |
381 | 380 | ||
382 | nla = (struct nlattr*)b; | 381 | nest = nla_nest_start(skb, TCA_OPTIONS); |
383 | NLA_PUT(skb, TCA_OPTIONS, 0, NULL); | 382 | if (nest == NULL) |
383 | goto nla_put_failure; | ||
384 | 384 | ||
385 | opt.limit = q->limit; | 385 | opt.limit = q->limit; |
386 | opt.rate = q->R_tab->rate; | 386 | opt.rate = q->R_tab->rate; |
@@ -391,12 +391,12 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) | |||
391 | opt.mtu = q->mtu; | 391 | opt.mtu = q->mtu; |
392 | opt.buffer = q->buffer; | 392 | opt.buffer = q->buffer; |
393 | NLA_PUT(skb, TCA_TBF_PARMS, sizeof(opt), &opt); | 393 | NLA_PUT(skb, TCA_TBF_PARMS, sizeof(opt), &opt); |
394 | nla->nla_len = skb_tail_pointer(skb) - b; | ||
395 | 394 | ||
395 | nla_nest_end(skb, nest); | ||
396 | return skb->len; | 396 | return skb->len; |
397 | 397 | ||
398 | nla_put_failure: | 398 | nla_put_failure: |
399 | nlmsg_trim(skb, b); | 399 | nla_nest_cancel(skb, nest); |
400 | return -1; | 400 | return -1; |
401 | } | 401 | } |
402 | 402 | ||