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

ipvs: Use state->net in the ipvs forward functions 



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 717e917d

net/netfilter/ipvs/ip_vs_core.c

+2 −6
Original line number Diff line number Diff line
@@ -1905,15 +1905,13 @@ ip_vs_forward_icmp(void *priv, struct sk_buff *skb, 
		   const struct nf_hook_state *state)

{

	int r;

	struct net *net;

	struct netns_ipvs *ipvs;



	if (ip_hdr(skb)->protocol != IPPROTO_ICMP)

		return NF_ACCEPT;



	/* ipvs enabled in this netns ? */

	net = skb_net(skb);

	ipvs = net_ipvs(net);

	ipvs = net_ipvs(state->net);

	if (unlikely(sysctl_backup_only(ipvs) || !ipvs->enable))

		return NF_ACCEPT;
@@ -1926,7 +1924,6 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb, 
		      const struct nf_hook_state *state)

{

	int r;

	struct net *net;

	struct netns_ipvs *ipvs;

	struct ip_vs_iphdr iphdr;
@@ -1935,8 +1932,7 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb, 
		return NF_ACCEPT;



	/* ipvs enabled in this netns ? */

	net = skb_net(skb);

	ipvs = net_ipvs(net);

	ipvs = net_ipvs(state->net);

	if (unlikely(sysctl_backup_only(ipvs) || !ipvs->enable))

		return NF_ACCEPT;