diff options
| author | Ian Morris <ipm@chirality.org.uk> | 2015-03-29 14:00:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 13:51:54 -0400 |
| commit | 53b24b8f94cb15e38e332db82177cf3f0f4df0c5 (patch) | |
| tree | c314553dc093f5226913a247c36c03012f7d22d7 /net/ipv6/raw.c | |
| parent | 63159f29be1df7f93563a8a0f78c5e65fc844ed6 (diff) | |
| download | linux-53b24b8f94cb15e38e332db82177cf3f0f4df0c5.tar.gz linux-53b24b8f94cb15e38e332db82177cf3f0f4df0c5.tar.bz2 linux-53b24b8f94cb15e38e332db82177cf3f0f4df0c5.zip | |
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/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index e33576df4658..79ccdb4c1b33 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -367,7 +367,7 @@ void raw6_icmp_error(struct sk_buff *skb, int nexthdr, read_lock(&raw_v6_hashinfo.lock); sk = sk_head(&raw_v6_hashinfo.ht[hash]); - if (sk != NULL) { + if (sk) { /* Note: ipv6_hdr(skb) != skb->data */ const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb->data; saddr = &ip6h->saddr; @@ -1130,7 +1130,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) spin_lock_bh(&sk->sk_receive_queue.lock); skb = skb_peek(&sk->sk_receive_queue); - if (skb != NULL) + if (skb) amount = skb_tail_pointer(skb) - skb_transport_header(skb); spin_unlock_bh(&sk->sk_receive_queue.lock); |