1 files changed, 6 insertions, 9 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 104070e92cea..a7a21a7ba790 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -138,7 +138,6 @@ struct rt6_info ip6_null_entry = {
                 .dst = {
                         .__refcnt       = ATOMIC_INIT(1),
                         .__use          = 1,
-                        .dev            = &loopback_dev,
                         .obsolete       = -1,
                         .error          = -ENETUNREACH,
                         .metrics        = { [RTAX_HOPLIMIT - 1] = 255, },
@@ -164,7 +163,6 @@ struct rt6_info ip6_prohibit_entry = {
                 .dst = {
                         .__refcnt       = ATOMIC_INIT(1),
                         .__use          = 1,
-                        .dev            = &loopback_dev,
                         .obsolete       = -1,
                         .error          = -EACCES,
                         .metrics        = { [RTAX_HOPLIMIT - 1] = 255, },
@@ -184,7 +182,6 @@ struct rt6_info ip6_blk_hole_entry = {
                 .dst = {
                         .__refcnt       = ATOMIC_INIT(1),
                         .__use          = 1,
-                        .dev            = &loopback_dev,
                         .obsolete       = -1,
                         .error          = -EINVAL,
                         .metrics        = { [RTAX_HOPLIMIT - 1] = 255, },
@@ -224,8 +221,8 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
         struct rt6_info *rt = (struct rt6_info *)dst;
         struct inet6_dev *idev = rt->rt6i_idev;
 
-        if (dev != &loopback_dev && idev != NULL && idev->dev == dev) {
-                struct inet6_dev *loopback_idev = in6_dev_get(&loopback_dev);
+        if (dev != loopback_dev && idev != NULL && idev->dev == dev) {
+                struct inet6_dev *loopback_idev = in6_dev_get(loopback_dev);
                 if (loopback_idev != NULL) {
                         rt->rt6i_idev = loopback_idev;
                         in6_dev_put(idev);
@@ -1188,12 +1185,12 @@ int ip6_route_add(struct fib6_config *cfg)
         if ((cfg->fc_flags & RTF_REJECT) ||
             (dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK))) {
                 /* hold loopback dev/idev if we haven't done so. */
-                if (dev != &loopback_dev) {
+                if (dev != loopback_dev) {
                         if (dev) {
                                 dev_put(dev);
                                 in6_dev_put(idev);
                         }
-                        dev = &loopback_dev;
+                        dev = loopback_dev;
                         dev_hold(dev);
                         idev = in6_dev_get(dev);
                         if (!idev) {
@@ -1897,13 +1894,13 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
         if (rt == NULL)
                 return ERR_PTR(-ENOMEM);
 
-        dev_hold(&loopback_dev);
+        dev_hold(loopback_dev);
         in6_dev_hold(idev);
 
         rt->u.dst.flags = DST_HOST;
         rt->u.dst.input = ip6_input;
         rt->u.dst.output = ip6_output;
-        rt->rt6i_dev = &loopback_dev;
+        rt->rt6i_dev = loopback_dev;
         rt->rt6i_idev = idev;
         rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev);
         rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst));