Merge branch 'linus' into tracing/ftrace

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

diff --git a/net/atm/clip.c b/net/atm/clip.c
index e82da674672355e5db011a6f00df73456e4e5a70..6f8223ebf551546d8be39503ba4c6489adeb0348 100644 (file)
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -612,7 +612,7 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
 {
        struct net_device *dev = arg;
 
-       if (dev->nd_net != &init_net)
+       if (dev_net(dev) != &init_net)
                return NOTIFY_DONE;
 
        if (event == NETDEV_UNREGISTER) {