aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2015-03-29 09:00:05 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-31 13:51:54 -0400
commit53b24b8f94cb15e38e332db82177cf3f0f4df0c5 (patch)
treec314553dc093f5226913a247c36c03012f7d22d7 /net/ipv6/af_inet6.c
parent63159f29be1df7f93563a8a0f78c5e65fc844ed6 (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/af_inet6.c')
-rw-r--r--net/ipv6/af_inet6.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 0e4889736a87..eef63b394c5a 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -413,11 +413,11 @@ void inet6_destroy_sock(struct sock *sk)
413 /* Release rx options */ 413 /* Release rx options */
414 414
415 skb = xchg(&np->pktoptions, NULL); 415 skb = xchg(&np->pktoptions, NULL);
416 if (skb != NULL) 416 if (skb)
417 kfree_skb(skb); 417 kfree_skb(skb);
418 418
419 skb = xchg(&np->rxpmtu, NULL); 419 skb = xchg(&np->rxpmtu, NULL);
420 if (skb != NULL) 420 if (skb)
421 kfree_skb(skb); 421 kfree_skb(skb);
422 422
423 /* Free flowlabels */ 423 /* Free flowlabels */
@@ -426,7 +426,7 @@ void inet6_destroy_sock(struct sock *sk)
426 /* Free tx options */ 426 /* Free tx options */
427 427
428 opt = xchg(&np->opt, NULL); 428 opt = xchg(&np->opt, NULL);
429 if (opt != NULL) 429 if (opt)
430 sock_kfree_s(sk, opt, opt->tot_len); 430 sock_kfree_s(sk, opt, opt->tot_len);
431} 431}
432EXPORT_SYMBOL_GPL(inet6_destroy_sock); 432EXPORT_SYMBOL_GPL(inet6_destroy_sock);