From 974ef9e4c0b54507f19290ae91456f300ab270c3 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 26 Feb 2008 22:20:44 -0800
Subject: [PATCH] --- yaml --- r: 86466 b: refs/heads/master c:
 d9595a7b9c777d45a74774f1428c263a0a47f4c0 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/key/af_key.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 744a0e49fd56..53f425bed608 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78374676efae525094aee45c0aab4bcab95ea9d1
+refs/heads/master: d9595a7b9c777d45a74774f1428c263a0a47f4c0
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index 1c853927810a..8b5f486ac80f 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -3807,17 +3807,16 @@ static int pfkey_init_proc(void)
 {
 	struct proc_dir_entry *e;
 
-	e = create_proc_entry("pfkey", 0, init_net.proc_net);
+	e = proc_net_fops_create(&init_net, "pfkey", 0, &pfkey_proc_ops);
 	if (e == NULL)
 		return -ENOMEM;
 
-	e->proc_fops = &pfkey_proc_ops;
 	return 0;
 }
 
 static void pfkey_exit_proc(void)
 {
-	remove_proc_entry("net/pfkey", NULL);
+	proc_net_remove(&init_net, "pfkey");
 }
 #else
 static inline int pfkey_init_proc(void)