diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:01:41 -0500 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:33 +0900 |
| commit | 58dbc6f2604a2cbff9e6ec144d1bb9d000a1a1ec (patch) | |
| tree | 412bf37816eb9b73c8efe8ccdca4e3702e7da1a6 /net/netfilter/ipvs/ip_vs_nfct.c | |
| parent | ipvs: Use state->net in the ipvs forward functions (diff) | |
| download | linux-dev-58dbc6f2604a2cbff9e6ec144d1bb9d000a1a1ec.tar.xz linux-dev-58dbc6f2604a2cbff9e6ec144d1bb9d000a1a1ec.zip | |
ipvs: Store ipvs not net in struct ip_vs_conn
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 conn->net to access conn->ipvs->net instead.
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c index 136184572fc9..dae3c069966f 100644 --- a/net/netfilter/ipvs/ip_vs_nfct.c +++ b/net/netfilter/ipvs/ip_vs_nfct.c @@ -274,8 +274,7 @@ void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) " for conn " FMT_CONN "\n", __func__, ARG_TUPLE(&tuple), ARG_CONN(cp)); - h = nf_conntrack_find_get(ip_vs_conn_net(cp), &nf_ct_zone_dflt, - &tuple); + h = nf_conntrack_find_get(cp->ipvs->net, &nf_ct_zone_dflt, &tuple); if (h) { ct = nf_ct_tuplehash_to_ctrack(h); /* Show what happens instead of calling nf_ct_kill() */ |