FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-12 04:19:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipvs: Pass ipvs into ip_vs_out

Browse Source 
Derive ipvs from state->net in the callers of ip_vs_out and pass it
into ip_vs_out.  Removing the need to use the hack skb_net.

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>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:52 -05:00 committed by Simon Horman
parent 2300f0451e
commit 1b75097dd7
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/netfilter/ipvs/ip_vs_core.c
View File

@ -1173,10 +1173,9 @@ drop:
* Check if outgoing packet belongs to the established ip_vs_conn. * Check if outgoing packet belongs to the established ip_vs_conn.
*/ */
static unsigned int static unsigned int
ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int af)
{ {
struct net *net = NULL; struct net *net = ipvs->net;
struct netns_ipvs *ipvs;
struct ip_vs_iphdr iph; struct ip_vs_iphdr iph;
struct ip_vs_protocol *pp; struct ip_vs_protocol *pp;
struct ip_vs_proto_data *pd; struct ip_vs_proto_data *pd;
@ -1201,8 +1200,6 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)
if (unlikely(!skb_dst(skb))) if (unlikely(!skb_dst(skb)))
return NF_ACCEPT; return NF_ACCEPT;
net = skb_net(skb);
ipvs = net_ipvs(net);
if (!ipvs->enable) if (!ipvs->enable)
return NF_ACCEPT; return NF_ACCEPT;
@ -1306,7 +1303,7 @@ static unsigned int
ip_vs_reply4(void *priv, struct sk_buff *skb, ip_vs_reply4(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) const struct nf_hook_state *state)
{ {
return ip_vs_out(state->hook, skb, AF_INET); return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET);
} }
/* /*
@ -1317,7 +1314,7 @@ static unsigned int
ip_vs_local_reply4(void *priv, struct sk_buff *skb, ip_vs_local_reply4(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) const struct nf_hook_state *state)
{ {
return ip_vs_out(state->hook, skb, AF_INET); return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET);
} }
#ifdef CONFIG_IP_VS_IPV6 #ifdef CONFIG_IP_VS_IPV6
@ -1331,7 +1328,7 @@ static unsigned int
ip_vs_reply6(void *priv, struct sk_buff *skb, ip_vs_reply6(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) const struct nf_hook_state *state)
{ {
return ip_vs_out(state->hook, skb, AF_INET6); return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET6);
} }
/* /*
@ -1342,7 +1339,7 @@ static unsigned int
ip_vs_local_reply6(void *priv, struct sk_buff *skb, ip_vs_local_reply6(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state) const struct nf_hook_state *state)
{ {
return ip_vs_out(state->hook, skb, AF_INET6); return ip_vs_out(net_ipvs(state->net), state->hook, skb, AF_INET6);
} }
#endif #endif