aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_gre.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2015-03-29 09:00:05 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-31 13:51:54 -0400
commit53b24b8f94cb15e38e332db82177cf3f0f4df0c5 (patch)
treec314553dc093f5226913a247c36c03012f7d22d7 /net/ipv6/ip6_gre.c
parent63159f29be1df7f93563a8a0f78c5e65fc844ed6 (diff)
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/ip6_gre.c')
-rw-r--r--net/ipv6/ip6_gre.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index aa9ea6e0d63a..67e014d88e55 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -223,7 +223,7 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,
223 } 223 }
224 } 224 }
225 225
226 if (cand != NULL) 226 if (cand)
227 return cand; 227 return cand;
228 228
229 dev = ign->fb_tunnel_dev; 229 dev = ign->fb_tunnel_dev;
@@ -1105,7 +1105,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,
1105 t = ip6gre_tunnel_locate(net, &p1, cmd == SIOCADDTUNNEL); 1105 t = ip6gre_tunnel_locate(net, &p1, cmd == SIOCADDTUNNEL);
1106 1106
1107 if (dev != ign->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) { 1107 if (dev != ign->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) {
1108 if (t != NULL) { 1108 if (t) {
1109 if (t->dev != dev) { 1109 if (t->dev != dev) {
1110 err = -EEXIST; 1110 err = -EEXIST;
1111 break; 1111 break;
@@ -1313,7 +1313,7 @@ static void ip6gre_destroy_tunnels(struct net *net, struct list_head *head)
1313 1313
1314 t = rtnl_dereference(ign->tunnels[prio][h]); 1314 t = rtnl_dereference(ign->tunnels[prio][h]);
1315 1315
1316 while (t != NULL) { 1316 while (t) {
1317 /* If dev is in the same netns, it has already 1317 /* If dev is in the same netns, it has already
1318 * been added to the list by the previous loop. 1318 * been added to the list by the previous loop.
1319 */ 1319 */