From 2766cd1e6dc1e9ca6098bf08a13a89bad855a16e Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@aristanetworks.com>
Date: Sun, 22 Feb 2009 00:10:18 -0800
Subject: [PATCH] --- yaml --- r: 132133 b: refs/heads/master c:
 2f20d2e667ab1ca44cde5fb361386dff5bb6081d h: refs/heads/master i:   132131:
 3ec86398e8ec5f92faa03e6dbe133f23fd7e5aad v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_ipv4.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8a9019bdd81..fe0d56d90bf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eb0777228f31932fc941eafe8b08848466630a1
+refs/heads/master: 2f20d2e667ab1ca44cde5fb361386dff5bb6081d
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index 19d7b429a262..cf74c416831a 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -2443,7 +2443,7 @@ static struct pernet_operations __net_initdata tcp_sk_ops = {
 void __init tcp_v4_init(void)
 {
 	inet_hashinfo_init(&tcp_hashinfo);
-	if (register_pernet_device(&tcp_sk_ops))
+	if (register_pernet_subsys(&tcp_sk_ops))
 		panic("Failed to create the TCP control socket.\n");
 }