[NET]: Dynamically allocate the loopback device, part 1.

This patch replaces all occurences to the static variable
loopback_dev to a pointer loopback_dev. That provides the
mindless, trivial, uninteressting change part for the dynamic
allocation for the loopback.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Acked-By: Kirill Korotaev <dev@sw.ru>
Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 17 insertions, 17 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 721b89b60963..affea9b121fc 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -203,7 +203,7 @@ static void inetdev_destroy(struct in_device *in_dev)
         ASSERT_RTNL();
 
         dev = in_dev->dev;
-        if (dev == &loopback_dev)
+        if (dev == loopback_dev)
                 return;
 
         in_dev->dead = 1;
@@ -1061,7 +1061,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
                         in_dev = inetdev_init(dev);
                         if (!in_dev)
                                 return notifier_from_errno(-ENOMEM);
-                        if (dev == &loopback_dev) {
+                        if (dev == loopback_dev) {
                                 IN_DEV_CONF_SET(in_dev, NOXFRM, 1);
                                 IN_DEV_CONF_SET(in_dev, NOPOLICY, 1);
                         }
@@ -1077,7 +1077,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
         case NETDEV_UP:
                 if (dev->mtu < 68)
                         break;
-                if (dev == &loopback_dev) {
+                if (dev == loopback_dev) {
                         struct in_ifaddr *ifa;
                         if ((ifa = inet_alloc_ifa()) != NULL) {
                                 ifa->ifa_local =
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4303851749f6..2d2e0cda0470 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -190,11 +190,11 @@ static int __init ic_open_devs(void)
         rtnl_lock();
 
         /* bring loopback device up first */
-        if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0)
-                printk(KERN_ERR "IP-Config: Failed to open %s\n", loopback_dev.name);
+        if (dev_change_flags(loopback_dev, loopback_dev->flags | IFF_UP) < 0)
+                printk(KERN_ERR "IP-Config: Failed to open %s\n", loopback_dev->name);
 
         for_each_netdev(&init_net, dev) {
-                if (dev == &loopback_dev)
+                if (dev == loopback_dev)
                         continue;
                 if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) :
                     (!(dev->flags & IFF_LOOPBACK) &&
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
index f005a2f929f4..74503267e5d4 100644
--- a/net/ipv4/ipvs/ip_vs_core.c
+++ b/net/ipv4/ipvs/ip_vs_core.c
@@ -961,7 +961,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff **pskb,
          *      ... don't know why 1st test DOES NOT include 2nd (?)
          */
         if (unlikely(skb->pkt_type != PACKET_HOST
-                     || skb->dev == &loopback_dev || skb->sk)) {
+                     || skb->dev == loopback_dev || skb->sk)) {
                 IP_VS_DBG(12, "packet type=%d proto=%d daddr=%d.%d.%d.%d ignored\n",
                           skb->pkt_type,
                           ip_hdr(skb)->protocol,
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 006d6058a806..ca2878dc6188 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1402,8 +1402,8 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 {
         struct rtable *rt = (struct rtable *) dst;
         struct in_device *idev = rt->idev;
-        if (dev != &loopback_dev && idev && idev->dev == dev) {
-                struct in_device *loopback_idev = in_dev_get(&loopback_dev);
+        if (dev != loopback_dev && idev && idev->dev == dev) {
+                struct in_device *loopback_idev = in_dev_get(loopback_dev);
                 if (loopback_idev) {
                         rt->idev = loopback_idev;
                         in_dev_put(idev);
@@ -1555,7 +1555,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
 #endif
         rth->rt_iif     =
         rth->fl.iif     = dev->ifindex;
-        rth->u.dst.dev  = &loopback_dev;
+        rth->u.dst.dev  = loopback_dev;
         dev_hold(rth->u.dst.dev);
         rth->idev       = in_dev_get(rth->u.dst.dev);
         rth->fl.oif     = 0;
@@ -1812,7 +1812,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         if (res.type == RTN_LOCAL) {
                 int result;
                 result = fib_validate_source(saddr, daddr, tos,
-                                             loopback_dev.ifindex,
+                                             loopback_dev->ifindex,
                                              dev, &spec_dst, &itag);
                 if (result < 0)
                         goto martian_source;
@@ -1879,7 +1879,7 @@ local_input:
 #endif
         rth->rt_iif     =
         rth->fl.iif     = dev->ifindex;
-        rth->u.dst.dev  = &loopback_dev;
+        rth->u.dst.dev  = loopback_dev;
         dev_hold(rth->u.dst.dev);
         rth->idev       = in_dev_get(rth->u.dst.dev);
         rth->rt_gateway = daddr;
@@ -2149,7 +2149,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
                                                   RT_SCOPE_UNIVERSE),
                                       } },
                             .mark = oldflp->mark,
-                            .iif = loopback_dev.ifindex,
+                            .iif = loopback_dev->ifindex,
                             .oif = oldflp->oif };
         struct fib_result res;
         unsigned flags = 0;
@@ -2243,9 +2243,9 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
                         fl.fl4_dst = fl.fl4_src = htonl(INADDR_LOOPBACK);
                 if (dev_out)
                         dev_put(dev_out);
-                dev_out = &loopback_dev;
+                dev_out = loopback_dev;
                 dev_hold(dev_out);
-                fl.oif = loopback_dev.ifindex;
+                fl.oif = loopback_dev->ifindex;
                 res.type = RTN_LOCAL;
                 flags |= RTCF_LOCAL;
                 goto make_route;
@@ -2290,7 +2290,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
                         fl.fl4_src = fl.fl4_dst;
                 if (dev_out)
                         dev_put(dev_out);
-                dev_out = &loopback_dev;
+                dev_out = loopback_dev;
                 dev_hold(dev_out);
                 fl.oif = dev_out->ifindex;
                 if (res.fi)
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 4ff8ed30024f..29ab3de8c47f 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -306,7 +306,7 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 
         xdst = (struct xfrm_dst *)dst;
         if (xdst->u.rt.idev->dev == dev) {
-                struct in_device *loopback_idev = in_dev_get(&loopback_dev);
+                struct in_device *loopback_idev = in_dev_get(loopback_dev);
                 BUG_ON(!loopback_idev);
 
                 do {