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/ax25/af_ax25.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/ax25/af_ax25.c')
-rw-r--r-- | net/ax25/af_ax25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 48bfcc741f25..ee9dd83e7561 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -116,7 +116,7 @@ static int ax25_device_event(struct notifier_block *this, unsigned long event, | |||
116 | { | 116 | { |
117 | struct net_device *dev = (struct net_device *)ptr; | 117 | struct net_device *dev = (struct net_device *)ptr; |
118 | 118 | ||
119 | if (dev->nd_net != &init_net) | 119 | if (dev_net(dev) != &init_net) |
120 | return NOTIFY_DONE; | 120 | return NOTIFY_DONE; |
121 | 121 | ||
122 | /* Reject non AX.25 devices */ | 122 | /* Reject non AX.25 devices */ |