Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[linux-2.6] / drivers / net / via-velocity.c

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index c50fdeed9e8557efd46ccf2958fb98db16dbc489..ed1afaf683a4bb96481325165929542bf04e6db8 100644 (file)
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -3464,6 +3464,9 @@ static int velocity_netdev_event(struct notifier_block *nb, unsigned long notifi
        struct velocity_info *vptr;
        unsigned long flags;
 
+       if (dev_net(dev) != &init_net)
+               return NOTIFY_DONE;
+
        spin_lock_irqsave(&velocity_dev_list_lock, flags);
        list_for_each_entry(vptr, &velocity_dev_list, list) {
                if (vptr->dev == dev) {