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 /drivers/net/hamradio/bpqether.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 'drivers/net/hamradio/bpqether.c')
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 5ddf8b0c34f9..5f4b4c6c9f76 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -172,7 +172,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty | |||
172 | struct ethhdr *eth; | 172 | struct ethhdr *eth; |
173 | struct bpqdev *bpq; | 173 | struct bpqdev *bpq; |
174 | 174 | ||
175 | if (dev->nd_net != &init_net) | 175 | if (dev_net(dev) != &init_net) |
176 | goto drop; | 176 | goto drop; |
177 | 177 | ||
178 | if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) | 178 | if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) |
@@ -553,7 +553,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi | |||
553 | { | 553 | { |
554 | struct net_device *dev = (struct net_device *)ptr; | 554 | struct net_device *dev = (struct net_device *)ptr; |
555 | 555 | ||
556 | if (dev->nd_net != &init_net) | 556 | if (dev_net(dev) != &init_net) |
557 | return NOTIFY_DONE; | 557 | return NOTIFY_DONE; |
558 | 558 | ||
559 | if (!dev_is_ethdev(dev)) | 559 | if (!dev_is_ethdev(dev)) |