aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/exthdrs_core.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2015-03-29 09:00:04 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-31 13:51:54 -0400
commit63159f29be1df7f93563a8a0f78c5e65fc844ed6 (patch)
treeaba1b4275abb0692728b97851f2d52e07d3f6e94 /net/ipv6/exthdrs_core.c
parentbc48878c06028f297e4fdf75be7dda88de050430 (diff)
ipv6: coding style: comparison for equality 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/exthdrs_core.c')
-rw-r--r--net/ipv6/exthdrs_core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/exthdrs_core.c b/net/ipv6/exthdrs_core.c
index 8af3eb57f438..5c5d23e59da5 100644
--- a/net/ipv6/exthdrs_core.c
+++ b/net/ipv6/exthdrs_core.c
@@ -82,7 +82,7 @@ int ipv6_skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp,
82 if (nexthdr == NEXTHDR_NONE) 82 if (nexthdr == NEXTHDR_NONE)
83 return -1; 83 return -1;
84 hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr); 84 hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr);
85 if (hp == NULL) 85 if (!hp)
86 return -1; 86 return -1;
87 if (nexthdr == NEXTHDR_FRAGMENT) { 87 if (nexthdr == NEXTHDR_FRAGMENT) {
88 __be16 _frag_off, *fp; 88 __be16 _frag_off, *fp;
@@ -91,7 +91,7 @@ int ipv6_skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp,
91 frag_off), 91 frag_off),
92 sizeof(_frag_off), 92 sizeof(_frag_off),
93 &_frag_off); 93 &_frag_off);
94 if (fp == NULL) 94 if (!fp)
95 return -1; 95 return -1;
96 96
97 *frag_offp = *fp; 97 *frag_offp = *fp;
@@ -218,7 +218,7 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
218 } 218 }
219 219
220 hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr); 220 hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr);
221 if (hp == NULL) 221 if (!hp)
222 return -EBADMSG; 222 return -EBADMSG;
223 223
224 if (nexthdr == NEXTHDR_ROUTING) { 224 if (nexthdr == NEXTHDR_ROUTING) {
@@ -226,7 +226,7 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
226 226
227 rh = skb_header_pointer(skb, start, sizeof(_rh), 227 rh = skb_header_pointer(skb, start, sizeof(_rh),
228 &_rh); 228 &_rh);
229 if (rh == NULL) 229 if (!rh)
230 return -EBADMSG; 230 return -EBADMSG;
231 231
232 if (flags && (*flags & IP6_FH_F_SKIP_RH) && 232 if (flags && (*flags & IP6_FH_F_SKIP_RH) &&
@@ -245,7 +245,7 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
245 frag_off), 245 frag_off),
246 sizeof(_frag_off), 246 sizeof(_frag_off),
247 &_frag_off); 247 &_frag_off);
248 if (fp == NULL) 248 if (!fp)
249 return -EBADMSG; 249 return -EBADMSG;
250 250
251 _frag_off = ntohs(*fp) & ~0x7; 251 _frag_off = ntohs(*fp) & ~0x7;