diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:01:43 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:33 +0900 |
commit | 19913dec1bc1d1aa5afe26db858507d4c3042665 (patch) | |
tree | 3fb38cb1295cbce10af87ecc3a1656150348f900 /net/netfilter/ipvs/ip_vs_nfct.c | |
parent | ipvs: Store ipvs not net in struct ip_vs_conn_param (diff) | |
download | linux-dev-19913dec1bc1d1aa5afe26db858507d4c3042665.tar.xz linux-dev-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 'net/netfilter/ipvs/ip_vs_nfct.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_nfct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c index dae3c069966f..30434fb133df 100644 --- a/net/netfilter/ipvs/ip_vs_nfct.c +++ b/net/netfilter/ipvs/ip_vs_nfct.c @@ -161,7 +161,7 @@ static void ip_vs_nfct_expect_callback(struct nf_conn *ct, /* RS->CLIENT */ orig = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple; - ip_vs_conn_fill_param(net, exp->tuple.src.l3num, orig->dst.protonum, + ip_vs_conn_fill_param(net_ipvs(net), exp->tuple.src.l3num, orig->dst.protonum, &orig->src.u3, orig->src.u.tcp.port, &orig->dst.u3, orig->dst.u.tcp.port, &p); cp = ip_vs_conn_out_get(&p); |