Merge branch 'ipv4-null-cmp'

Ian Morris says: ==================== ipv4: coding style - comparisons with NULL Per the suggestion of Joe Perches, attached is a patch which aligns the coding style in ipv4 for comparisons with NULL. The code uses multiple different styles when comparing with NULL (I.e. x == NULL and !x as well as x != NULL and x). Generally the latter form is preferred in netdev and so this changes aligns the code to this style. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2026-09-26 18:16:26 +00:00 · 2015-04-03 12:11:15 -04:00 · 2015-04-03 12:11:15 -04:00 · 0bd6682722
commit 0bd6682722
parent 11a9c7821c 00db41243e
46 changed files with 272 additions and 263 deletions
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
--- a/net/ipv4/udp_diag.c
+++ b/net/ipv4/udp_diag.c
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c