Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 176971b3 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Pablo Neira Ayuso
Browse files

ipvs: Read hooknum from state rather than ops->hooknum 



This should be more cache efficient as state is more likely to be in
core, and the netfilter core will stop passing in ops soon.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a31f1adc

net/netfilter/ipvs/ip_vs_core.c

+8 −8
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ static unsigned int 
ip_vs_reply4(const struct nf_hook_ops *ops, struct sk_buff *skb,

	     const struct nf_hook_state *state)

{

	return ip_vs_out(ops->hooknum, skb, AF_INET);

	return ip_vs_out(state->hook, skb, AF_INET);

}



/*
@@ -1325,7 +1325,7 @@ static unsigned int 
ip_vs_local_reply4(const struct nf_hook_ops *ops, struct sk_buff *skb,

		   const struct nf_hook_state *state)

{

	return ip_vs_out(ops->hooknum, skb, AF_INET);

	return ip_vs_out(state->hook, skb, AF_INET);

}



#ifdef CONFIG_IP_VS_IPV6
@@ -1339,7 +1339,7 @@ static unsigned int 
ip_vs_reply6(const struct nf_hook_ops *ops, struct sk_buff *skb,

	     const struct nf_hook_state *state)

{

	return ip_vs_out(ops->hooknum, skb, AF_INET6);

	return ip_vs_out(state->hook, skb, AF_INET6);

}



/*
@@ -1350,7 +1350,7 @@ static unsigned int 
ip_vs_local_reply6(const struct nf_hook_ops *ops, struct sk_buff *skb,

		   const struct nf_hook_state *state)

{

	return ip_vs_out(ops->hooknum, skb, AF_INET6);

	return ip_vs_out(state->hook, skb, AF_INET6);

}



#endif
@@ -1850,7 +1850,7 @@ static unsigned int 
ip_vs_remote_request4(const struct nf_hook_ops *ops, struct sk_buff *skb,

		      const struct nf_hook_state *state)

{

	return ip_vs_in(ops->hooknum, skb, AF_INET);

	return ip_vs_in(state->hook, skb, AF_INET);

}



/*
@@ -1861,7 +1861,7 @@ static unsigned int 
ip_vs_local_request4(const struct nf_hook_ops *ops, struct sk_buff *skb,

		     const struct nf_hook_state *state)

{

	return ip_vs_in(ops->hooknum, skb, AF_INET);

	return ip_vs_in(state->hook, skb, AF_INET);

}



#ifdef CONFIG_IP_VS_IPV6
@@ -1874,7 +1874,7 @@ static unsigned int 
ip_vs_remote_request6(const struct nf_hook_ops *ops, struct sk_buff *skb,

		      const struct nf_hook_state *state)

{

	return ip_vs_in(ops->hooknum, skb, AF_INET6);

	return ip_vs_in(state->hook, skb, AF_INET6);

}



/*
@@ -1885,7 +1885,7 @@ static unsigned int 
ip_vs_local_request6(const struct nf_hook_ops *ops, struct sk_buff *skb,

		     const struct nf_hook_state *state)

{

	return ip_vs_in(ops->hooknum, skb, AF_INET6);

	return ip_vs_in(state->hook, skb, AF_INET6);

}



#endif