diff options
| author | Eric W. Biederman | 2015-09-21 20:02:36 +0200 |
|---|---|---|
| committer | Simon Horman | 2015-09-24 02:34:40 +0200 |
| commit | 1281a9c2d181a932ae2f59f5711ae087a58f1c13 (patch) | |
| tree | 268e8b00086c742cbf00ba78b910f5e4abb406ec /net/netfilter/ipvs/ip_vs_proto.c | |
| parent | ipvs: Pass ipvs not net into [un]register_ip_vs_proto_netns (diff) | |
| download | kernel-qcow2-linux-1281a9c2d181a932ae2f59f5711ae087a58f1c13.tar.gz kernel-qcow2-linux-1281a9c2d181a932ae2f59f5711ae087a58f1c13.tar.xz kernel-qcow2-linux-1281a9c2d181a932ae2f59f5711ae087a58f1c13.zip | |
ipvs: Pass ipvs not net into init_netns and exit_netns
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_proto.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_proto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index fb581babe5e2..f05ee668a1d1 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -78,7 +78,7 @@ register_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_protocol *pp) atomic_set(&pd->appcnt, 0); /* Init app counter */ if (pp->init_netns != NULL) { - int ret = pp->init_netns(ipvs->net, pd); + int ret = pp->init_netns(ipvs, pd); if (ret) { /* unlink an free proto data */ ipvs->proto_data_table[hash] = pd->next; @@ -125,7 +125,7 @@ unregister_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_proto_data *p if (*pd_p == pd) { *pd_p = pd->next; if (pd->pp->exit_netns != NULL) - pd->pp->exit_netns(ipvs->net, pd); + pd->pp->exit_netns(ipvs, pd); kfree(pd); return 0; } |