diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 20:03:00 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-09-24 02:34:43 +0200 |
| commit | 9cfdd75b7c049895317aebb0e27f8112e7e31593 (patch) | |
| tree | e2c445b61977068994799f70ec7b3ef37cc5a03b /include/net/ip_vs.h | |
| parent | ipvs: Remove skb_net (diff) | |
| download | linux-9cfdd75b7c049895317aebb0e27f8112e7e31593.tar.xz linux-9cfdd75b7c049895317aebb0e27f8112e7e31593.zip | |
ipvs: Remove skb_sknet
This function adds no real value and it obscures what the code is doing.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/net/ip_vs.h')
| -rw-r--r-- | include/net/ip_vs.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index d621330d423c..0816c872b689 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -38,28 +38,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net) return net->ipvs; } -static inline struct net *skb_sknet(const struct sk_buff *skb) -{ -#ifdef CONFIG_NET_NS -#ifdef CONFIG_IP_VS_DEBUG - /* Start with the most likely hit */ - if (likely(skb->sk && sock_net(skb->sk))) - return sock_net(skb->sk); - WARN(skb->dev, "Maybe skb_net should be used instead in %s() line:%d\n", - __func__, __LINE__); - if (likely(skb->dev && dev_net(skb->dev))) - return dev_net(skb->dev); - pr_err("There is no net ptr to find in the skb in %s() line:%d\n", - __func__, __LINE__); - BUG(); -#else - return sock_net(skb->sk); -#endif -#else - return &init_net; -#endif -} - /* This one needed for single_open_net since net is stored directly in * private not as a struct i.e. seq_file_net can't be used. */ |