diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-25 08:47:49 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-25 15:39:53 -0400 |
commit | c346dca10840a874240c78efe3f39acf4312a1f2 (patch) | |
tree | c04cff20124eba5cc337cc5ec260ad2513eeb065 /net/netlabel/netlabel_unlabeled.c | |
parent | 7cbca67c073263c179f605bdbbdc565ab29d801d (diff) |
[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.
Introduce per-net_device inlines: dev_net(), dev_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
-rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index 4478f2f6079d..a547c6320eb3 100644 --- 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, | |||
954 | struct net_device *dev = ptr; | 954 | struct net_device *dev = ptr; |
955 | struct netlbl_unlhsh_iface *iface = NULL; | 955 | struct netlbl_unlhsh_iface *iface = NULL; |
956 | 956 | ||
957 | if (dev->nd_net != &init_net) | 957 | if (dev_net(dev) != &init_net) |
958 | return NOTIFY_DONE; | 958 | return NOTIFY_DONE; |
959 | 959 | ||
960 | /* XXX - should this be a check for NETDEV_DOWN or _UNREGISTER? */ | 960 | /* XXX - should this be a check for NETDEV_DOWN or _UNREGISTER? */ |