net: sched: cls_fw: no need to call tcf_exts_change for newly allocated struct

As the f struct was allocated right before fw_set_parms call, no need
to use tcf_exts_change to do atomic change, and we can just fill-up
the unused exts struct directly by tcf_exts_validate.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 358bf34f0dd02508327d9d5f2691bbff0b453507..11f178f1b2be166f2b7e01a013580e2c88e099fa 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -195,16 +195,12 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp,
                        struct nlattr **tca, unsigned long base, bool ovr)
 {
        struct fw_head *head = rtnl_dereference(tp->root);
-       struct tcf_exts e;
        u32 mask;
        int err;
 
-       err = tcf_exts_init(&e, TCA_FW_ACT, TCA_FW_POLICE);
+       err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &f->exts, ovr);
        if (err < 0)
                return err;
-       err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, ovr);
-       if (err < 0)
-               goto errout;
 
        if (tb[TCA_FW_CLASSID]) {
                f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]);
@@ -215,10 +211,8 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp,
        if (tb[TCA_FW_INDEV]) {
                int ret;
                ret = tcf_change_indev(net, tb[TCA_FW_INDEV]);
-               if (ret < 0) {
-                       err = ret;
-                       goto errout;
-               }
+               if (ret < 0)
+                       return ret;
                f->ifindex = ret;
        }
 #endif /* CONFIG_NET_CLS_IND */
@@ -227,16 +221,11 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp,
        if (tb[TCA_FW_MASK]) {
                mask = nla_get_u32(tb[TCA_FW_MASK]);
                if (mask != head->mask)
-                       goto errout;
+                       return err;
        } else if (head->mask != 0xFFFFFFFF)
-               goto errout;
-
-       tcf_exts_change(tp, &f->exts, &e);
+               return err;
 
        return 0;
-errout:
-       tcf_exts_destroy(&e);
-       return err;
 }
 
 static int fw_change(struct net *net, struct sk_buff *in_skb,