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

[linux-2.6] / net / atm / mpc.c

diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 9c7f712fc7e9c331e4dcd3c3b1d9c0fbdae3b01b..9db332e7a6c091f1b3996da838af5b1d52b10f7e 100644 (file)
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -964,7 +964,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo
 
        dev = (struct net_device *)dev_ptr;
 
-       if (dev->nd_net != &init_net)
+       if (dev_net(dev) != &init_net)
                return NOTIFY_DONE;
 
        if (dev->name == NULL || strncmp(dev->name, "lec", 3))