提交 1b75097d 编写于 作者: E Eric W. Biederman 提交者: Simon Horman

ipvs: Pass ipvs into ip_vs_out

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: N"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: NJulian Anastasov <ja@ssi.bg>
Signed-off-by: NSimon Horman <horms@verge.net.au>
上级 2300f045
...@@ -1173,10 +1173,9 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, ...@@ -1173,10 +1173,9 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
* 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) ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册