aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/reassembly.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/reassembly.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/reassembly.c')
-rw-r--r--net/ipv6/reassembly.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index d7d70e69973b..24fbc0abfff6 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -430,7 +430,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
430 int i, plen = 0; 430 int i, plen = 0;
431 431
432 clone = alloc_skb(0, GFP_ATOMIC); 432 clone = alloc_skb(0, GFP_ATOMIC);
433 if (clone == NULL) 433 if (!clone)
434 goto out_oom; 434 goto out_oom;
435 clone->next = head->next; 435 clone->next = head->next;
436 head->next = clone; 436 head->next = clone;
@@ -632,7 +632,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
632 table = ip6_frags_ns_ctl_table; 632 table = ip6_frags_ns_ctl_table;
633 if (!net_eq(net, &init_net)) { 633 if (!net_eq(net, &init_net)) {
634 table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL); 634 table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
635 if (table == NULL) 635 if (!table)
636 goto err_alloc; 636 goto err_alloc;
637 637
638 table[0].data = &net->ipv6.frags.high_thresh; 638 table[0].data = &net->ipv6.frags.high_thresh;
@@ -648,7 +648,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
648 } 648 }
649 649
650 hdr = register_net_sysctl(net, "net/ipv6", table); 650 hdr = register_net_sysctl(net, "net/ipv6", table);
651 if (hdr == NULL) 651 if (!hdr)
652 goto err_reg; 652 goto err_reg;
653 653
654 net->ipv6.sysctl.frags_hdr = hdr; 654 net->ipv6.sysctl.frags_hdr = hdr;