From 7dfd53042c35c4f1be89b79c3650b2ed9bc70e5a Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 5 May 2010 00:56:33 -0700
Subject: [PATCH] --- yaml --- r: 194653 b: refs/heads/master c:
 8753d29fd5daf890004a38c80835e1eb3acda394 h: refs/heads/master i:   194651:
 55e0b0889ee197bed87837a38fc2dee05b77f233 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/pppoe.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3cfd949eab2e..184b532d9f6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a12761bcd5646691c5d16dd93df84d1b8849285
+refs/heads/master: 8753d29fd5daf890004a38c80835e1eb3acda394
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index c059c8db42e3..99f031a08a01 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -290,12 +290,6 @@ static void pppoe_flush_dev(struct net_device *dev)
 	struct pppoe_net *pn;
 	int i;
 
-	BUG_ON(dev == NULL);
-
-	pn = pppoe_pernet(dev_net(dev));
-	if (!pn) /* already freed */
-		return;
-
 	write_lock_bh(&pn->hash_lock);
 	for (i = 0; i < PPPOE_HASH_SIZE; i++) {
 		struct pppox_sock *po = pn->hash_table[i];