git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
net
/
netlabel
/
netlabel_unlabeled.c
diff --git
a/net/netlabel/netlabel_unlabeled.c
b/net/netlabel/netlabel_unlabeled.c
index
56f8087
..
921c118
100644
(file)
--- a/
net/netlabel/netlabel_unlabeled.c
+++ b/
net/netlabel/netlabel_unlabeled.c
@@
-954,7
+954,7
@@
static int netlbl_unlhsh_netdev_handler(struct notifier_block *this,
struct net_device *dev = ptr;
struct netlbl_unlhsh_iface *iface = NULL;
- if (
dev_net(dev) != &init_net
)
+ if (
!net_eq(dev_net(dev), &init_net)
)
return NOTIFY_DONE;
/* XXX - should this be a check for NETDEV_DOWN or _UNREGISTER? */