diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-14 07:29:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 07:29:59 +0200 |
| commit | b76c4b27fee9c88294d3152784291fc6f6d23401 (patch) | |
| tree | afdaf5706f8d930d9ac5441ebdb6245e1a136fa7 /net/dccp | |
| parent | [NETNS][DCCPV4]: Move the dccp_v4_ctl_sk on the struct net. (diff) | |
| download | linux-b76c4b27fee9c88294d3152784291fc6f6d23401.tar.xz linux-b76c4b27fee9c88294d3152784291fc6f6d23401.zip | |
[NETNS][DCCPV4]: Actually create ctl socket on each net and use it.
Move the call to inet_ctl_sock_create to init callback (and
inet_ctl_sock_destroy to exit one) and use proper ctl sock
in dccp_v4_ctl_send_reset.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ipv4.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 85931dce744c..cad62d8d87a0 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -505,7 +505,8 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) const struct iphdr *rxiph; struct sk_buff *skb; struct dst_entry *dst; - struct sock *ctl_sk = init_net.dccp.v4_ctl_sk; + struct net *net = dev_net(rxskb->dst->dev); + struct sock *ctl_sk = net->dccp.v4_ctl_sk; /* Never send a reset in response to a reset. */ if (dccp_hdr(rxskb)->dccph_type == DCCP_PKT_RESET) @@ -991,11 +992,16 @@ static struct inet_protosw dccp_v4_protosw = { static int dccp_v4_init_net(struct net *net) { - return 0; + int err; + + err = inet_ctl_sock_create(&net->dccp.v4_ctl_sk, PF_INET, + SOCK_DCCP, IPPROTO_DCCP, net); + return err; } static void dccp_v4_exit_net(struct net *net) { + inet_ctl_sock_destroy(net->dccp.v4_ctl_sk); } static struct pernet_operations dccp_v4_ops = { @@ -1016,19 +1022,12 @@ static int __init dccp_v4_init(void) inet_register_protosw(&dccp_v4_protosw); - err = inet_ctl_sock_create(&init_net.dccp.v4_ctl_sk, PF_INET, - SOCK_DCCP, IPPROTO_DCCP, &init_net); - if (err) - goto out_unregister_protosw; - err = register_pernet_subsys(&dccp_v4_ops); if (err) goto out_destroy_ctl_sock; out: return err; out_destroy_ctl_sock: - inet_ctl_sock_destroy(init_net.dccp.v4_ctl_sk); -out_unregister_protosw: inet_unregister_protosw(&dccp_v4_protosw); inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); out_proto_unregister: @@ -1039,7 +1038,6 @@ out_proto_unregister: static void __exit dccp_v4_exit(void) { unregister_pernet_subsys(&dccp_v4_ops); - inet_ctl_sock_destroy(init_net.dccp.v4_ctl_sk); inet_unregister_protosw(&dccp_v4_protosw); inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); proto_unregister(&dccp_v4_prot); |