[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>

6 files changed, 22 insertions, 22 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index aebd08606040..812534828914 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -216,7 +216,7 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
 /* Device list insertion */
 static int list_netdevice(struct net_device *dev)
 {
-        struct net *net = dev->nd_net;
+        struct net *net = dev_net(dev);
 
         ASSERT_RTNL();
 
@@ -852,8 +852,8 @@ int dev_alloc_name(struct net_device *dev, const char *name)
         struct net *net;
         int ret;
 
-        BUG_ON(!dev->nd_net);
-        net = dev->nd_net;
+        BUG_ON(!dev_net(dev));
+        net = dev_net(dev);
         ret = __dev_alloc_name(net, name, buf);
         if (ret >= 0)
                 strlcpy(dev->name, buf, IFNAMSIZ);
@@ -877,9 +877,9 @@ int dev_change_name(struct net_device *dev, char *newname)
         struct net *net;
 
         ASSERT_RTNL();
-        BUG_ON(!dev->nd_net);
+        BUG_ON(!dev_net(dev));
 
-        net = dev->nd_net;
+        net = dev_net(dev);
         if (dev->flags & IFF_UP)
                 return -EBUSY;
 
@@ -2615,7 +2615,7 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq, "Type Device      Function\n");
-        else if (pt->dev == NULL || pt->dev->nd_net == seq_file_net(seq)) {
+        else if (pt->dev == NULL || dev_net(pt->dev) == seq_file_net(seq)) {
                 if (pt->type == htons(ETH_P_ALL))
                         seq_puts(seq, "ALL ");
                 else
@@ -3689,8 +3689,8 @@ int register_netdevice(struct net_device *dev)
 
         /* When net_device's are persistent, this will be fatal. */
         BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);
-        BUG_ON(!dev->nd_net);
-        net = dev->nd_net;
+        BUG_ON(!dev_net(dev));
+        net = dev_net(dev);
 
         spin_lock_init(&dev->queue_lock);
         spin_lock_init(&dev->_xmit_lock);
@@ -4011,7 +4011,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
         dev = (struct net_device *)
                 (((long)p + NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST);
         dev->padded = (char *)dev - (char *)p;
-        dev->nd_net = &init_net;
+        dev_net_set(dev, &init_net);
 
         if (sizeof_priv) {
                 dev->priv = ((char *)dev +
@@ -4136,7 +4136,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
 
         /* Get out if there is nothing todo */
         err = 0;
-        if (dev->nd_net == net)
+        if (dev_net(dev) == net)
                 goto out;
 
         /* Pick the destination device name, and ensure
@@ -4187,7 +4187,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
         dev_addr_discard(dev);
 
         /* Actually switch the network namespace */
-        dev->nd_net = net;
+        dev_net_set(dev, net);
 
         /* Assign the new device name */
         if (destname != dev->name)
diff --git a/net/core/dst.c b/net/core/dst.c
index 3a01a819ba47..694cd2a3f6d2 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -279,7 +279,7 @@ static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
         if (!unregister) {
                 dst->input = dst->output = dst_discard;
         } else {
-                dst->dev = dst->dev->nd_net->loopback_dev;
+                dst->dev = dev_net(dst->dev)->loopback_dev;
                 dev_hold(dst->dev);
                 dev_put(dev);
                 if (dst->neighbour && dst->neighbour->dev == dev) {
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 42ccaf5b8509..942be93a2eb0 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -618,7 +618,7 @@ static int fib_rules_event(struct notifier_block *this, unsigned long event,
                             void *ptr)
 {
         struct net_device *dev = ptr;
-        struct net *net = dev->nd_net;
+        struct net *net = dev_net(dev);
         struct fib_rules_ops *ops;
 
         ASSERT_RTNL();
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 23c0a10c0c37..c978bd1cd659 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -388,7 +388,7 @@ struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net,
         hash_val = tbl->hash(pkey, NULL);
         for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) {
                 if (!memcmp(n->primary_key, pkey, key_len) &&
-                    (net == n->dev->nd_net)) {
+                    dev_net(n->dev) == net) {
                         neigh_hold(n);
                         NEIGH_CACHE_STAT_INC(tbl, hits);
                         break;
@@ -1298,7 +1298,7 @@ struct neigh_parms *neigh_parms_alloc(struct net_device *dev,
         struct neigh_parms *p, *ref;
         struct net *net;
 
-        net = dev->nd_net;
+        net = dev_net(dev);
         ref = lookup_neigh_params(tbl, net, 0);
         if (!ref)
                 return NULL;
@@ -2050,7 +2050,7 @@ static int neigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,
                         s_idx = 0;
                 for (n = tbl->hash_buckets[h], idx = 0; n; n = n->next) {
                         int lidx;
-                        if (n->dev->nd_net != net)
+                        if (dev_net(n->dev) != net)
                                 continue;
                         lidx = idx++;
                         if (lidx < s_idx)
@@ -2155,7 +2155,7 @@ static struct neighbour *neigh_get_first(struct seq_file *seq)
                 n = tbl->hash_buckets[bucket];
 
                 while (n) {
-                        if (n->dev->nd_net != net)
+                        if (dev_net(n->dev) != net)
                                 goto next;
                         if (state->neigh_sub_iter) {
                                 loff_t fakep = 0;
@@ -2198,7 +2198,7 @@ static struct neighbour *neigh_get_next(struct seq_file *seq,
 
         while (1) {
                 while (n) {
-                        if (n->dev->nd_net != net)
+                        if (dev_net(n->dev) != net)
                                 goto next;
                         if (state->neigh_sub_iter) {
                                 void *v = state->neigh_sub_iter(state, n, pos);
@@ -2482,7 +2482,7 @@ static inline size_t neigh_nlmsg_size(void)
 
 static void __neigh_notify(struct neighbour *n, int type, int flags)
 {
-        struct net *net = n->dev->nd_net;
+        struct net *net = dev_net(n->dev);
         struct sk_buff *skb;
         int err = -ENOBUFS;
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 20e63b302ba6..a803b442234c 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1874,7 +1874,7 @@ static int pktgen_device_event(struct notifier_block *unused,
 {
         struct net_device *dev = ptr;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         /* It is OK that we do not hold the group lock right now,
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2bd9c5f7627d..09250a0800f6 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -972,7 +972,7 @@ struct net_device *rtnl_create_link(struct net *net, char *ifname,
                         goto err_free;
         }
 
-        dev->nd_net = net;
+        dev_net_set(dev, net);
         dev->rtnl_link_ops = ops;
 
         if (tb[IFLA_MTU])
@@ -1198,7 +1198,7 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)
 
 void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)
 {
-        struct net *net = dev->nd_net;
+        struct net *net = dev_net(dev);
         struct sk_buff *skb;
         int err = -ENOBUFS;