pkt_sched: Stop using NLA_PUT*().

[deliverable/linux.git] / net / sched / cls_fw.c

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 389af152ec45ae2e3a50313dd36a5797ef4a4048..8384a47972403360c22688d8daa1ebdf34338aad 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -346,14 +346,17 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh,
        if (nest == NULL)
                goto nla_put_failure;
 
-       if (f->res.classid)
-               NLA_PUT_U32(skb, TCA_FW_CLASSID, f->res.classid);
+       if (f->res.classid &&
+           nla_put_u32(skb, TCA_FW_CLASSID, f->res.classid))
+               goto nla_put_failure;
 #ifdef CONFIG_NET_CLS_IND
-       if (strlen(f->indev))
-               NLA_PUT_STRING(skb, TCA_FW_INDEV, f->indev);
+       if (strlen(f->indev) &&
+           nla_put_string(skb, TCA_FW_INDEV, f->indev))
+               goto nla_put_failure;
 #endif /* CONFIG_NET_CLS_IND */
-       if (head->mask != 0xFFFFFFFF)
-               NLA_PUT_U32(skb, TCA_FW_MASK, head->mask);
+       if (head->mask != 0xFFFFFFFF &&
+           nla_put_u32(skb, TCA_FW_MASK, head->mask))
+               goto nla_put_failure;
 
        if (tcf_exts_dump(skb, &f->exts, &fw_ext_map) < 0)
                goto nla_put_failure;