mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
ipvs: Pass ipvs not net to ip_vs_svc_hashkey
Use the address of ipvs not the address of net when computing the hash value. This removes an unncessary dependency on struct 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:
parent
1ed8b94780
commit
ba61f39034
1 changed files with 4 additions and 4 deletions
|
@ -263,7 +263,7 @@ static struct hlist_head ip_vs_svc_fwm_table[IP_VS_SVC_TAB_SIZE];
|
|||
* Returns hash value for virtual service
|
||||
*/
|
||||
static inline unsigned int
|
||||
ip_vs_svc_hashkey(struct net *net, int af, unsigned int proto,
|
||||
ip_vs_svc_hashkey(struct netns_ipvs *ipvs, int af, unsigned int proto,
|
||||
const union nf_inet_addr *addr, __be16 port)
|
||||
{
|
||||
register unsigned int porth = ntohs(port);
|
||||
|
@ -276,7 +276,7 @@ ip_vs_svc_hashkey(struct net *net, int af, unsigned int proto,
|
|||
addr->ip6[2]^addr->ip6[3];
|
||||
#endif
|
||||
ahash = ntohl(addr_fold);
|
||||
ahash ^= ((size_t) net >> 8);
|
||||
ahash ^= ((size_t) ipvs >> 8);
|
||||
|
||||
return (proto ^ ahash ^ (porth >> IP_VS_SVC_TAB_BITS) ^ porth) &
|
||||
IP_VS_SVC_TAB_MASK;
|
||||
|
@ -309,7 +309,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc)
|
|||
/*
|
||||
* Hash it by <netns,protocol,addr,port> in ip_vs_svc_table
|
||||
*/
|
||||
hash = ip_vs_svc_hashkey(svc->ipvs->net, svc->af, svc->protocol,
|
||||
hash = ip_vs_svc_hashkey(svc->ipvs, svc->af, svc->protocol,
|
||||
&svc->addr, svc->port);
|
||||
hlist_add_head_rcu(&svc->s_list, &ip_vs_svc_table[hash]);
|
||||
} else {
|
||||
|
@ -365,7 +365,7 @@ __ip_vs_service_find(struct net *net, int af, __u16 protocol,
|
|||
struct ip_vs_service *svc;
|
||||
|
||||
/* Check for "full" addressed entries */
|
||||
hash = ip_vs_svc_hashkey(net, af, protocol, vaddr, vport);
|
||||
hash = ip_vs_svc_hashkey(ipvs, af, protocol, vaddr, vport);
|
||||
|
||||
hlist_for_each_entry_rcu(svc, &ip_vs_svc_table[hash], s_list) {
|
||||
if ((svc->af == af)
|
||||
|
|
Loading…
Reference in a new issue