1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index cdd11ba100ea..b1b93ff2351f 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -89,7 +89,6 @@
 #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)
 #define PPPOE_HASH_MASK (PPPOE_HASH_SIZE - 1)
 
-static int pppoe_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 
@@ -258,7 +257,7 @@ static inline struct pppox_sock *get_item_by_addr(struct net *net,
         dev = dev_get_by_name_rcu(net, sp->sa_addr.pppoe.dev);
         if (dev) {
                 ifindex = dev->ifindex;
-                pn = net_generic(net, pppoe_net_id);
+                pn = pppoe_pernet(net);
                 pppox_sock = get_item(pn, sp->sa_addr.pppoe.sid,
                                 sp->sa_addr.pppoe.remote, ifindex);
         }
@@ -290,12 +289,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];
@@ -368,7 +361,7 @@ static int pppoe_device_event(struct notifier_block *this,
 
         default:
                 break;
-        };
+        }
 
         return NOTIFY_DONE;
 }