Commit 27d79f3b authored by Sachin Kamat's avatar Sachin Kamat Committed by David S. Miller
Browse files

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: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c88460b7

net/ipv4/ip_tunnel.c

+2 −1
Original line number Diff line number Diff line
@@ -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);