diff options
author | Eric W. Biederman | 2015-09-21 20:02:58 +0200 |
---|---|---|
committer | Simon Horman | 2015-09-24 02:34:43 +0200 |
commit | 7d1f88eca0ae7228bdbd971f060603b3a1270693 (patch) | |
tree | 7dfc60c5d77256fe803e9332d026e9b21bc8479c /net/netfilter/ipvs/ip_vs_proto.c | |
parent | ipvs: Remove net argument from ip_vs_tcp_conn_listen (diff) | |
download | kernel-qcow2-linux-7d1f88eca0ae7228bdbd971f060603b3a1270693.tar.gz kernel-qcow2-linux-7d1f88eca0ae7228bdbd971f060603b3a1270693.tar.xz kernel-qcow2-linux-7d1f88eca0ae7228bdbd971f060603b3a1270693.zip |
ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup)
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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c index f05ee668a1d1..8ae480715cea 100644 --- a/net/netfilter/ipvs/ip_vs_proto.c +++ b/net/netfilter/ipvs/ip_vs_proto.c @@ -307,7 +307,7 @@ ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp, /* * per network name-space init */ -int __net_init ip_vs_protocol_net_init(struct net *net) +int __net_init ip_vs_protocol_net_init(struct netns_ipvs *ipvs) { int i, ret; static struct ip_vs_protocol *protos[] = { @@ -327,7 +327,6 @@ int __net_init ip_vs_protocol_net_init(struct net *net) &ip_vs_protocol_esp, #endif }; - struct netns_ipvs *ipvs = net_ipvs(net); for (i = 0; i < ARRAY_SIZE(protos); i++) { ret = register_ip_vs_proto_netns(ipvs, protos[i]); @@ -337,13 +336,12 @@ int __net_init ip_vs_protocol_net_init(struct net *net) return 0; cleanup: - ip_vs_protocol_net_cleanup(net); + ip_vs_protocol_net_cleanup(ipvs); return ret; } -void __net_exit ip_vs_protocol_net_cleanup(struct net *net) +void __net_exit ip_vs_protocol_net_cleanup(struct netns_ipvs *ipvs) { - struct netns_ipvs *ipvs = net_ipvs(net); struct ip_vs_proto_data *pd; int i; |