diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 20:01:42 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-09-24 02:34:33 +0200 |
| commit | e64e2b460cedadf93d05a23e9ad397cc0386568c (patch) | |
| tree | eb54dd524e1bd5b4dba768cb631554a1d8cb722b /include/net/ip_vs.h | |
| parent | ipvs: Store ipvs not net in struct ip_vs_conn (diff) | |
| download | linux-e64e2b460cedadf93d05a23e9ad397cc0386568c.tar.xz linux-e64e2b460cedadf93d05a23e9ad397cc0386568c.zip | |
ipvs: Store ipvs not net in struct ip_vs_conn_param
In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data. So store a pointer to
struct netns_ipvs.
Update the accesses of param->net to access param->ipvs->net instead.
When lookup up struct ip_vs_conn in a hash table replace comparisons
of cp->net with comparisons of cp->ipvs which is possible
now that ipvs is present in ip_vs_conn_param.
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>
Diffstat (limited to 'include/net/ip_vs.h')
| -rw-r--r-- | include/net/ip_vs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 3bf6da8fdaf1..8cca99bbe15b 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -545,7 +545,7 @@ struct ip_vs_proto_data *ip_vs_proto_data_get(struct net *net, unsigned short proto); struct ip_vs_conn_param { - struct net *net; + struct netns_ipvs *ipvs; const union nf_inet_addr *caddr; const union nf_inet_addr *vaddr; __be16 cport; @@ -1208,7 +1208,7 @@ static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol, __be16 vport, struct ip_vs_conn_param *p) { - p->net = net; + p->ipvs = net_ipvs(net); p->af = af; p->protocol = protocol; p->caddr = caddr; |