diff options
author | Ian Morris <ipm@chirality.org.uk> | 2015-04-03 04:17:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-03 12:11:15 -0400 |
commit | 00db41243e8d5032c2e0f5bf6063bb19324bfdb3 (patch) | |
tree | 627f419868eac50f1ae8582915827b2525fc5999 /net/ipv4/tcp_ipv4.c | |
parent | 51456b2914a34d16b1255b7c55d5cbf6a681d306 (diff) |
ipv4: coding style: comparison for inequality with NULL
The ipv4 code uses a mixture of coding styles. In some instances check
for non-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/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9ff311cf00f3..560f9571f7c4 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1305,7 +1305,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
1305 | /* Copy over the MD5 key from the original socket */ | 1305 | /* Copy over the MD5 key from the original socket */ |
1306 | key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&newinet->inet_daddr, | 1306 | key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&newinet->inet_daddr, |
1307 | AF_INET); | 1307 | AF_INET); |
1308 | if (key != NULL) { | 1308 | if (key) { |
1309 | /* | 1309 | /* |
1310 | * We're using one, so create a matching key | 1310 | * We're using one, so create a matching key |
1311 | * on the newsk structure. If we fail to get | 1311 | * on the newsk structure. If we fail to get |
@@ -1797,7 +1797,7 @@ void tcp_v4_destroy_sock(struct sock *sk) | |||
1797 | if (inet_csk(sk)->icsk_bind_hash) | 1797 | if (inet_csk(sk)->icsk_bind_hash) |
1798 | inet_put_port(sk); | 1798 | inet_put_port(sk); |
1799 | 1799 | ||
1800 | BUG_ON(tp->fastopen_rsk != NULL); | 1800 | BUG_ON(tp->fastopen_rsk); |
1801 | 1801 | ||
1802 | /* If socket is aborted during connect operation */ | 1802 | /* If socket is aborted during connect operation */ |
1803 | tcp_free_fastopen_req(tp); | 1803 | tcp_free_fastopen_req(tp); |