net sched actions: fix coding style in pedit action

Fix coding style issues in tc pedit action detected by the
checkpatch script.

Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 8a925c72db5fe413eaf4db3ac231f26484b049cb..e4b29ee79ba8a41c1b317b5f7d7a4393f30b0cb0 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -136,15 +136,15 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
 {
        struct tc_action_net *tn = net_generic(net, pedit_net_id);
        struct nlattr *tb[TCA_PEDIT_MAX + 1];
-       struct nlattr *pattr;
-       struct tc_pedit *parm;
-       int ret = 0, err;
-       struct tcf_pedit *p;
        struct tc_pedit_key *keys = NULL;
        struct tcf_pedit_key_ex *keys_ex;
+       struct tc_pedit *parm;
+       struct nlattr *pattr;
+       struct tcf_pedit *p;
+       int ret = 0, err;
        int ksize;
 
-       if (nla == NULL)
+       if (!nla)
                return -EINVAL;
 
        err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, pedit_policy, NULL);
@@ -175,7 +175,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
                        return ret;
                p = to_pedit(*a);
                keys = kmalloc(ksize, GFP_KERNEL);
-               if (keys == NULL) {
+               if (!keys) {
                        tcf_idr_release(*a, bind);
                        kfree(keys_ex);
                        return -ENOMEM;
@@ -220,6 +220,7 @@ static void tcf_pedit_cleanup(struct tc_action *a)
 {
        struct tcf_pedit *p = to_pedit(a);
        struct tc_pedit_key *keys = p->tcfp_keys;
+
        kfree(keys);
        kfree(p->tcfp_keys_ex);
 }
@@ -284,7 +285,8 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
        if (p->tcfp_nkeys > 0) {
                struct tc_pedit_key *tkey = p->tcfp_keys;
                struct tcf_pedit_key_ex *tkey_ex = p->tcfp_keys_ex;
-               enum pedit_header_type htype = TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
+               enum pedit_header_type htype =
+                       TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
                enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;
 
                for (i = p->tcfp_nkeys; i > 0; i--, tkey++) {
@@ -316,16 +318,15 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                                                hoffset + tkey->at);
                                        goto bad;
                                }
-                               d = skb_header_pointer(skb, hoffset + tkey->at, 1,
-                                                      &_d);
+                               d = skb_header_pointer(skb, hoffset + tkey->at,
+                                                      1, &_d);
                                if (!d)
                                        goto bad;
                                offset += (*d & tkey->offmask) >> tkey->shift;
                        }
 
                        if (offset % 4) {
-                               pr_info("tc filter pedit"
-                                       " offset must be on 32 bit boundaries\n");
+                               pr_info("tc filter pedit offset must be on 32 bit boundaries\n");
                                goto bad;
                        }
 
@@ -335,7 +336,8 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                                goto bad;
                        }
 
-                       ptr = skb_header_pointer(skb, hoffset + offset, 4, &_data);
+                       ptr = skb_header_pointer(skb, hoffset + offset,
+                                                4, &_data);
                        if (!ptr)
                                goto bad;
                        /* just do it, baby */
@@ -358,8 +360,9 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                }
 
                goto done;
-       } else
+       } else {
                WARN(1, "pedit BUG: index %d\n", p->tcf_index);
+       }
 
 bad:
        p->tcf_qstats.overlimits++;