diff options
| author | Hans Schillstrom <hans.schillstrom@ericsson.com> | 2011-01-03 13:44:52 (GMT) |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-01-13 01:30:27 (GMT) |
| commit | 9bbac6a904d0816dae58b454692c54d6773cc20d (patch) | |
| tree | f29698f1230e2a0b6fda2546f1f6da256d442979 /net/netfilter/ipvs/ip_vs_proto_sctp.c | |
| parent | 9330419d9aa4f97df412ac9be9fc0388c67dd315 (diff) | |
| download | linux-9bbac6a904d0816dae58b454692c54d6773cc20d.tar.xz | |
IPVS: netns, common protocol changes and use of appcnt.
appcnt and timeout_table moved from struct ip_vs_protocol to
ip_vs proto_data.
struct net *net added as first param to
- register_app()
- unregister_app()
- app_conn_bind()
- ip_vs_conn_new()
[horms@verge.net.au: removed cosmetic-change-only hunk]
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.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_sctp.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c index 19bc379..0f14f79 100644 --- a/net/netfilter/ipvs/ip_vs_proto_sctp.c +++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c @@ -1035,7 +1035,7 @@ static int sctp_register_app(struct ip_vs_app *inc) } } list_add(&inc->p_list, &ipvs->sctp_apps[hash]); - atomic_inc(&pd->pp->appcnt); + atomic_inc(&pd->appcnt); out: spin_unlock_bh(&ipvs->sctp_app_lock); @@ -1048,7 +1048,7 @@ static void sctp_unregister_app(struct ip_vs_app *inc) struct ip_vs_proto_data *pd = ip_vs_proto_data_get(&init_net, IPPROTO_SCTP); spin_lock_bh(&ipvs->sctp_app_lock); - atomic_dec(&pd->pp->appcnt); + atomic_dec(&pd->appcnt); list_del(&inc->p_list); spin_unlock_bh(&ipvs->sctp_app_lock); } |