diff options
author | Ian Morris <ipm@chirality.org.uk> | 2015-03-29 09:00:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-31 13:51:54 -0400 |
commit | 53b24b8f94cb15e38e332db82177cf3f0f4df0c5 (patch) | |
tree | c314553dc093f5226913a247c36c03012f7d22d7 /net/ipv6/ip6_fib.c | |
parent | 63159f29be1df7f93563a8a0f78c5e65fc844ed6 (diff) |
ipv6: coding style: comparison for inequality with NULL
The ipv6 code uses a mixture of coding styles. In some instances check for NULL
pointer is done as x != NULL and sometimes as x. x is preferred according to
checkpatch and this patch makes the code consistent by adopting the latter
form.
No changes detected by objdiff.
Signed-off-by: Ian Morris <ipm@chirality.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
-rw-r--r-- | net/ipv6/ip6_fib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 263ef4143bff..96dbffff5a24 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
@@ -1206,7 +1206,7 @@ static struct fib6_node *fib6_repair_tree(struct net *net, | |||
1206 | 1206 | ||
1207 | WARN_ON(fn->fn_flags & RTN_RTINFO); | 1207 | WARN_ON(fn->fn_flags & RTN_RTINFO); |
1208 | WARN_ON(fn->fn_flags & RTN_TL_ROOT); | 1208 | WARN_ON(fn->fn_flags & RTN_TL_ROOT); |
1209 | WARN_ON(fn->leaf != NULL); | 1209 | WARN_ON(fn->leaf); |
1210 | 1210 | ||
1211 | children = 0; | 1211 | children = 0; |
1212 | child = NULL; | 1212 | child = NULL; |
@@ -1361,7 +1361,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info) | |||
1361 | 1361 | ||
1362 | #if RT6_DEBUG >= 2 | 1362 | #if RT6_DEBUG >= 2 |
1363 | if (rt->dst.obsolete > 0) { | 1363 | if (rt->dst.obsolete > 0) { |
1364 | WARN_ON(fn != NULL); | 1364 | WARN_ON(fn); |
1365 | return -ENOENT; | 1365 | return -ENOENT; |
1366 | } | 1366 | } |
1367 | #endif | 1367 | #endif |