From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 27 Jan 2014 06:43:57 +0000 (+0530)
Subject: net: ipv4: Use PTR_ERR_OR_ZERO
X-Git-Tag: accepted/tizen/common/20141203.182822~684^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27d79f3b1071b2a2d58443a130e92c381c838e5d;p=platform%2Fkernel%2Flinux-arm64.git

net: ipv4: Use PTR_ERR_OR_ZERO

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>
---

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index c0e3cb7..bd28f38 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -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);