From: Alexander Aring <aring@mojatatu.com>
Date: Thu, 18 Jan 2018 11:20:49 -0500
Subject: net: sched: cls: fix code style issues
Patch-mainline: v4.16-rc1
Git-commit: 8865fdd4e1538a775c5ac2157fb8eb45bee9dc18
References: bsc#1109837
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>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
include/net/sch_generic.h | 3 ++-
net/sched/cls_matchall.c | 2 +-
net/sched/cls_u32.c | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -239,7 +239,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);
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -203,7 +203,7 @@ static int mall_change(struct net *net,
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;
}
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -784,7 +784,7 @@ static int u32_set_parms(struct net *net
if (handle) {
ht_down = u32_lookup_ht(ht->tp_c, handle);
- if (ht_down == NULL)
+ if (!ht_down)
return -EINVAL;
ht_down->refcnt++;
}
@@ -908,7 +908,7 @@ static int u32_change(struct net *net, s
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);
@@ -1012,7 +1012,7 @@ static int u32_change(struct net *net, s
htid = ht->handle;
} else {
ht = u32_lookup_ht(tp->data, TC_U32_HTID(htid));
- if (ht == NULL)
+ if (!ht)
return -EINVAL;
}
} else {
@@ -1024,7 +1024,7 @@ static int u32_change(struct net *net, s
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,