]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ipv4: Use PTR_ERR_OR_ZERO
authorSachin Kamat <sachin.kamat@linaro.org>
Mon, 27 Jan 2014 06:43:57 +0000 (12:13 +0530)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Jan 2014 20:57:31 +0000 (12:57 -0800)
PTR_RET is deprecated. Use PTR_ERR_OR_ZERO instead. While at it
also include missing err.h header.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_tunnel.c

index c0e3cb72ad70ad211f4801e13c5e207dc48318e3..bd28f386bd02020ef3adc4295a90021d6d43a0f7 100644 (file)
@@ -40,6 +40,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
 #include <linux/rculist.h>
+#include <linux/err.h>
 
 #include <net/sock.h>
 #include <net/ip.h>
@@ -930,7 +931,7 @@ int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,
        }
        rtnl_unlock();
 
-       return PTR_RET(itn->fb_tunnel_dev);
+       return PTR_ERR_OR_ZERO(itn->fb_tunnel_dev);
 }
 EXPORT_SYMBOL_GPL(ip_tunnel_init_net);