1 files changed, 6 insertions, 5 deletions

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index fcb4826158d6..10a2f35a27a8 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1343,22 +1343,23 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,
                 struct tcmsg *tcm)
 {
         struct hfsc_class *cl = (struct hfsc_class *)arg;
-        unsigned char *b = skb_tail_pointer(skb);
-        struct nlattr *nla = (struct nlattr *)b;
+        struct nlattr *nest;
 
         tcm->tcm_parent = cl->cl_parent ? cl->cl_parent->classid : TC_H_ROOT;
         tcm->tcm_handle = cl->classid;
         if (cl->level == 0)
                 tcm->tcm_info = cl->qdisc->handle;
 
-        NLA_PUT(skb, TCA_OPTIONS, 0, NULL);
+        nest = nla_nest_start(skb, TCA_OPTIONS);
+        if (nest == NULL)
+                goto nla_put_failure;
         if (hfsc_dump_curves(skb, cl) < 0)
                 goto nla_put_failure;
-        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;
 }