net: sched: act: fix code style

This patch is used by subsequent patches. It fixes code style issues
caught by checkpatch.

Signed-off-by: Alexander Aring <aring@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 6ed9692f20bdd02e9c7cab528d50281b21990d0a..32ef544f4ddcc5230dd47b80e57a255d8b6a24ce 100644 (file)
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -87,12 +87,13 @@ struct tc_action_ops {
                       struct tcf_result *);
        int     (*dump)(struct sk_buff *, struct tc_action *, int, int);
        void    (*cleanup)(struct tc_action *);
-       int     (*lookup)(struct net *, struct tc_action **, u32);
+       int     (*lookup)(struct net *net, struct tc_action **a, u32 index);
        int     (*init)(struct net *net, struct nlattr *nla,
                        struct nlattr *est, struct tc_action **act, int ovr,
                        int bind);
        int     (*walk)(struct net *, struct sk_buff *,
-                       struct netlink_callback *, int, const struct tc_action_ops *);
+                       struct netlink_callback *, int,
+                       const struct tc_action_ops *);
        void    (*stats_update)(struct tc_action *, u64, u32, u64);
        struct net_device *(*get_dev)(const struct tc_action *a);
 };

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 624995564e5abb2ef352de95b40f78b72e819940..a32e6c2edbf6321cf9d1e30c886dfbbfdf7f0aa5 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -621,7 +621,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
                        goto err_out;
                err = -EINVAL;
                kind = tb[TCA_ACT_KIND];
-               if (kind == NULL)
+               if (!kind)
                        goto err_out;
                if (nla_strlcpy(act_name, kind, IFNAMSIZ) >= IFNAMSIZ)
                        goto err_out;
@@ -822,7 +822,7 @@ static int tca_get_fill(struct sk_buff *skb, struct list_head *actions,
        t->tca__pad2 = 0;
 
        nest = nla_nest_start(skb, TCA_ACT_TAB);
-       if (nest == NULL)
+       if (!nest)
                goto out_nlmsg_trim;
 
        if (tcf_action_dump(skb, actions, bind, ref) < 0)
@@ -934,7 +934,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
        t->tca__pad2 = 0;
 
        nest = nla_nest_start(skb, TCA_ACT_TAB);
-       if (nest == NULL)
+       if (!nest)
                goto out_module_put;
 
        err = ops->walk(net, skb, &dcb, RTM_DELACTION, ops);
@@ -1007,10 +1007,10 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
                return ret;
 
        if (event == RTM_DELACTION && n->nlmsg_flags & NLM_F_ROOT) {
-               if (tb[1] != NULL)
+               if (tb[1])
                        return tca_action_flush(net, tb[1], n, portid);
-               else
-                       return -EINVAL;
+
+               return -EINVAL;
        }
 
        for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index e6ff88f729009498e74cca36a05d49bafcfcfedf..abcd5f12b9139878e917e56ef0ac10bb6377bdd9 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -80,12 +80,12 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
        bool exists = false;
        int ret;
 
-       if (nla == NULL)
+       if (!nla)
                return -EINVAL;
        ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy, NULL);
        if (ret < 0)
                return ret;
-       if (tb[TCA_MIRRED_PARMS] == NULL)
+       if (!tb[TCA_MIRRED_PARMS])
                return -EINVAL;
        parm = nla_data(tb[TCA_MIRRED_PARMS]);
 
@@ -117,7 +117,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
        }
 
        if (!exists) {
-               if (dev == NULL)
+               if (!dev)
                        return -EINVAL;
                ret = tcf_idr_create(tn, parm->index, est, a,
                                     &act_mirred_ops, bind, true);