From 49a1907f2ab1912041543d1c343eac9d6300117d Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Sun, 13 Apr 2008 22:29:59 -0700 Subject: [PATCH] --- yaml --- r: 90658 b: refs/heads/master c: b76c4b27fee9c88294d3152784291fc6f6d23401 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/ipv4.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f54a6b731f4d..40255d491cbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b1cffa8c90269dc3dc721d084d1e0d742d87c31 +refs/heads/master: b76c4b27fee9c88294d3152784291fc6f6d23401 diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 85931dce744c..cad62d8d87a0 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/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 @@ static int __init dccp_v4_init(void) 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);