diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 20:01:43 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-09-24 02:34:33 +0200 |
| commit | 19913dec1bc1d1aa5afe26db858507d4c3042665 (patch) | |
| tree | 3fb38cb1295cbce10af87ecc3a1656150348f900 /include/net/ip_vs.h | |
| parent | ipvs: Store ipvs not net in struct ip_vs_conn_param (diff) | |
| download | linux-19913dec1bc1d1aa5afe26db858507d4c3042665.tar.xz linux-19913dec1bc1d1aa5afe26db858507d4c3042665.zip | |
ipvs: Pass ipvs not net to ip_vs_fill_conn
ipvs is what is actually desired so change the parameter and the modify
the callers to pass struct netns_ipvs.
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 8cca99bbe15b..83e2aea63db2 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1201,14 +1201,14 @@ enum { IP_VS_DIR_LAST, }; -static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol, +static inline void ip_vs_conn_fill_param(struct netns_ipvs *ipvs, int af, int protocol, const union nf_inet_addr *caddr, __be16 cport, const union nf_inet_addr *vaddr, __be16 vport, struct ip_vs_conn_param *p) { - p->ipvs = net_ipvs(net); + p->ipvs = ipvs; p->af = af; p->protocol = protocol; p->caddr = caddr; |