2 files changed, 20 insertions, 2 deletions

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index af685f71f4b..34ee348a2cf 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -28,6 +28,7 @@ struct netns_ipv4 {
         struct sock             *fibnl;
 
         struct sock             **icmp_sk;
+        struct sock             *tcp_sock;
 
         struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index dc8c3dc75fe..1d4a77acdc0 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2488,11 +2488,28 @@ struct proto tcp_prot = {
 #endif
 };
 
+
+static int __net_init tcp_sk_init(struct net *net)
+{
+        return inet_ctl_sock_create(&net->ipv4.tcp_sock,
+                                    PF_INET, SOCK_RAW, IPPROTO_TCP, net);
+}
+
+static void __net_exit tcp_sk_exit(struct net *net)
+{
+        inet_ctl_sock_destroy(net->ipv4.tcp_sock);
+}
+
+static struct pernet_operations __net_initdata tcp_sk_ops = {
+       .init = tcp_sk_init,
+       .exit = tcp_sk_exit,
+};
+
 void __init tcp_v4_init(void)
 {
-        if (inet_ctl_sock_create(&tcp_sock, PF_INET, SOCK_RAW,
-                                 IPPROTO_TCP, &init_net) < 0)
+        if (register_pernet_device(&tcp_sk_ops))
                 panic("Failed to create the TCP control socket.\n");
+        tcp_sock = init_net.ipv4.tcp_sock;
 }
 
 EXPORT_SYMBOL(ipv4_specific);