net: sched: cls: fix code style issues

This patch changes some code style issues pointed out by checkpatch
inside the TC cls subsystem.

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

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index cfc19d0ba2addf4e48eb640bc832634422048d76..c90f5fe6bed90693c094ef8d0f84b04b7220ac43 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -240,7 +240,8 @@ struct tcf_proto_ops {
                                        struct tcf_proto*, unsigned long,
                                        u32 handle, struct nlattr **,
                                        void **, bool);
-       int                     (*delete)(struct tcf_proto*, void *, bool*);
+       int                     (*delete)(struct tcf_proto *tp, void *arg,
+                                         bool *last);
        void                    (*walk)(struct tcf_proto*, struct tcf_walker *arg);
        void                    (*bind_class)(void *, u32, unsigned long);
 

diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index d0e57c86636f480343ae324096a144acbd683840..aeae89eeed0d048ec18847f0afa0655026cf3b48 100644 (file)
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -203,7 +203,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
                goto err_set_parms;
 
        if (!tc_skip_hw(new->flags)) {
-               err = mall_replace_hw_filter(tp, new, (unsigned long) new);
+               err = mall_replace_hw_filter(tp, new, (unsigned long)new);
                if (err)
                        goto err_replace_hw_filter;
        }

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 020d328d0afd7335d038d7f9b9616e489ce60000..84129b3c14e53df24d2341ff4cdc7c481bf8348e 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -783,7 +783,7 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
                if (handle) {
                        ht_down = u32_lookup_ht(ht->tp_c, handle);
 
-                       if (ht_down == NULL)
+                       if (!ht_down)
                                return -EINVAL;
                        ht_down->refcnt++;
                }
@@ -907,7 +907,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
        size_t size;
 #endif
 
-       if (opt == NULL)
+       if (!opt)
                return handle ? -EINVAL : 0;
 
        err = nla_parse_nested(tb, TCA_U32_MAX, opt, u32_policy, NULL);
@@ -1011,7 +1011,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                        htid = ht->handle;
                } else {
                        ht = u32_lookup_ht(tp->data, TC_U32_HTID(htid));
-                       if (ht == NULL)
+                       if (!ht)
                                return -EINVAL;
                }
        } else {
@@ -1023,7 +1023,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                return -EINVAL;
 
        if (handle) {
-               if (TC_U32_HTID(handle) && TC_U32_HTID(handle^htid))
+               if (TC_U32_HTID(handle) && TC_U32_HTID(handle ^ htid))
                        return -EINVAL;
                handle = htid | TC_U32_NODE(handle);
                err = idr_alloc_ext(&ht->handle_idr, NULL, NULL,