From 9e86d79b7152e3229614165cfd5ee1a2cdd6b0d9 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: 134659 b: refs/heads/master c:
 6a1b3054d9fd98001a6631501caf1969138ee00d h: refs/heads/master i:   134657:
 1f802660a55d8de797370d142553fd74c46ab6cb   134655:
 a27a40745c11a82c07c5800ad19b249043c3d100 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 a2a7e8793f45..745ec84cc996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 959d2726499175c6b724d87fed1dafca7582efe2
+refs/heads/master: 6a1b3054d9fd98001a6631501caf1969138ee00d
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index f6b962f56ab4..a7381205bbfc 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");
 }