From f6afcb20d59bef04af5fd0a21460a0b9ec5ab348 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Fri, 23 Apr 2010 01:01:52 +0000
Subject: [PATCH] --- yaml --- r: 194519 b: refs/heads/master c:
 3a737028630bb3c2b9efc38b9ddef2e09b06b808 h: refs/heads/master i:   194517:
 edd61f3b6b1ce49524d115599f78564c822b6135   194515:
 0cac5b0764c55b482dfb028b843717a63ec3afed   194511:
 28e46025ba895e99da34817465aae54617077f44 v: v3

---
 [refs]                    |  2 +-
 trunk/net/l2tp/l2tp_eth.c | 29 +----------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index aa1e91729b12..178ed9d972ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e773aaff8295e7f3428d9cf6f8a476a33de00716
+refs/heads/master: 3a737028630bb3c2b9efc38b9ddef2e09b06b808
diff --git a/trunk/net/l2tp/l2tp_eth.c b/trunk/net/l2tp/l2tp_eth.c
index ca1164afeb74..58c6c4cda73b 100644
--- a/trunk/net/l2tp/l2tp_eth.c
+++ b/trunk/net/l2tp/l2tp_eth.c
@@ -276,43 +276,16 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p
 
 static __net_init int l2tp_eth_init_net(struct net *net)
 {
-	struct l2tp_eth_net *pn;
-	int err;
-
-	pn = kzalloc(sizeof(*pn), GFP_KERNEL);
-	if (!pn)
-		return -ENOMEM;
+	struct l2tp_eth_net *pn = net_generic(net, l2tp_eth_net_id);
 
 	INIT_LIST_HEAD(&pn->l2tp_eth_dev_list);
 	spin_lock_init(&pn->l2tp_eth_lock);
 
-	err = net_assign_generic(net, l2tp_eth_net_id, pn);
-	if (err)
-		goto out;
-
 	return 0;
-
-out:
-	kfree(pn);
-	return err;
-}
-
-static __net_exit void l2tp_eth_exit_net(struct net *net)
-{
-	struct l2tp_eth_net *pn;
-
-	pn = net_generic(net, l2tp_eth_net_id);
-	/*
-	 * if someone has cached our net then
-	 * further net_generic call will return NULL
-	 */
-	net_assign_generic(net, l2tp_eth_net_id, NULL);
-	kfree(pn);
 }
 
 static __net_initdata struct pernet_operations l2tp_eth_net_ops = {
 	.init = l2tp_eth_init_net,
-	.exit = l2tp_eth_exit_net,
 	.id   = &l2tp_eth_net_id,
 	.size = sizeof(struct l2tp_eth_net),
 };