diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-01-27 07:43:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-27 21:57:31 +0100 |
| commit | 27d79f3b1071b2a2d58443a130e92c381c838e5d (patch) | |
| tree | e8edaf10fbef83022aea486677d27ab01ae3119f /net | |
| parent | net: stmmac: Log MAC address only once (diff) | |
| download | linux-27d79f3b1071b2a2d58443a130e92c381c838e5d.tar.xz linux-27d79f3b1071b2a2d58443a130e92c381c838e5d.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index c0e3cb72ad70..bd28f386bd02 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); |