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/sch_atm.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/sch_atm.c')
| -rw-r--r-- | net/sched/sch_atm.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index aaa32a22726d..19c00074ba1f 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -605,8 +605,7 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl, { struct atm_qdisc_data *p = qdisc_priv(sch); struct atm_flow_data *flow = (struct atm_flow_data *)cl; - unsigned char *b = skb_tail_pointer(skb); - struct nlattr *nla; + struct nlattr *nest; pr_debug("atm_tc_dump_class(sch %p,[qdisc %p],flow %p,skb %p,tcm %p)\n", sch, p, flow, skb, tcm); @@ -614,8 +613,11 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl, return -EINVAL; tcm->tcm_handle = flow->classid; tcm->tcm_info = flow->q->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; + NLA_PUT(skb, TCA_ATM_HDR, flow->hdr_len, flow->hdr); if (flow->vcc) { struct sockaddr_atmpvc pvc; @@ -636,11 +638,12 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl, NLA_PUT(skb, TCA_ATM_EXCESS, sizeof(zero), &zero); } - nla->nla_len = skb_tail_pointer(skb) - b; + + nla_nest_end(skb, nest); return skb->len; nla_put_failure: - nlmsg_trim(skb, b); + nla_nest_cancel(skb, nest); return -1; } static int |