Merge remote branch 'tip/perf/urgent' into oprofile/urgent

[mv-sheeva.git] / drivers / net / pppoe.c

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 99f031a08a015942609eebd6a7dc897d77dcc00a..805b64d1e893564bfc7aa1b3957c1df606dcf46a 100644 (file)
--- 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);
 
@@ -290,6 +289,7 @@ static void pppoe_flush_dev(struct net_device *dev)
        struct pppoe_net *pn;
        int i;
 
+       pn = pppoe_pernet(dev_net(dev));
        write_lock_bh(&pn->hash_lock);
        for (i = 0; i < PPPOE_HASH_SIZE; i++) {
                struct pppox_sock *po = pn->hash_table[i];
@@ -362,7 +362,7 @@ static int pppoe_device_event(struct notifier_block *this,
 
        default:
                break;
-       };
+       }
 
        return NOTIFY_DONE;
 }