[NET_SCHED]: Use typeful attribute construction helpers

[mirror_ubuntu-artful-kernel.git] / net / sched / cls_tcindex.c

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index cd350d38bdafbba49341c76286a9b2864dc3d22c..7d46df7eac0955eff20eddb9cae3a33951df65d0 100644 (file)
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -449,11 +449,10 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
 
        if (!fh) {
                t->tcm_handle = ~0; /* whatever ... */
-               NLA_PUT(skb, TCA_TCINDEX_HASH, sizeof(p->hash), &p->hash);
-               NLA_PUT(skb, TCA_TCINDEX_MASK, sizeof(p->mask), &p->mask);
-               NLA_PUT(skb, TCA_TCINDEX_SHIFT, sizeof(p->shift), &p->shift);
-               NLA_PUT(skb, TCA_TCINDEX_FALL_THROUGH, sizeof(p->fall_through),
-                   &p->fall_through);
+               NLA_PUT_U32(skb, TCA_TCINDEX_HASH, p->hash);
+               NLA_PUT_U16(skb, TCA_TCINDEX_MASK, p->mask);
+               NLA_PUT_U32(skb, TCA_TCINDEX_SHIFT, p->shift);
+               NLA_PUT_U32(skb, TCA_TCINDEX_FALL_THROUGH, p->fall_through);
                nla_nest_end(skb, nest);
        } else {
                if (p->perfect) {
@@ -473,7 +472,7 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
                }
                pr_debug("handle = %d\n", t->tcm_handle);
                if (r->res.class)
-                       NLA_PUT(skb, TCA_TCINDEX_CLASSID, 4, &r->res.classid);
+                       NLA_PUT_U32(skb, TCA_TCINDEX_CLASSID, r->res.classid);
 
                if (tcf_exts_dump(skb, &r->exts, &tcindex_ext_map) < 0)
                        goto nla_put_failure;