Commit 7c6c21ee authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Remove skb_net 



This hack has no more users so remove it.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 7d1f88ec

include/net/ip_vs.h

+0 −31
Original line number Diff line number Diff line
@@ -38,37 +38,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net) 
	return net->ipvs;

}



/* Get net ptr from skb in traffic cases

 * use skb_sknet when call is from userland (ioctl or netlink)

 */

static inline struct net *skb_net(const struct sk_buff *skb)

{

#ifdef CONFIG_NET_NS

#ifdef CONFIG_IP_VS_DEBUG

	/*

	 * This is used for debug only.

	 * Start with the most likely hit

	 * End with BUG

	 */

	if (likely(skb->dev && dev_net(skb->dev)))

		return dev_net(skb->dev);

	if (skb_dst(skb) && skb_dst(skb)->dev)

		return dev_net(skb_dst(skb)->dev);

	WARN(skb->sk, "Maybe skb_sknet should be used in %s() at line:%d\n",

		      __func__, __LINE__);

	if (likely(skb->sk && sock_net(skb->sk)))

		return sock_net(skb->sk);

	pr_err("There is no net ptr to find in the skb in %s() line:%d\n",

		__func__, __LINE__);

	BUG();

#else

	return dev_net(skb->dev ? : skb_dst(skb)->dev);

#endif

#else

	return &init_net;

#endif

}



static inline struct net *skb_sknet(const struct sk_buff *skb)

{

#ifdef CONFIG_NET_NS