Merge tag 'mmc-merge-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / net / ipv6 / addrconf.c

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 480e68422efb3c0f3ff7267ac89b8fe2b0d42fee..d7c56f8a5b4e76028ebd4f66e5a928ea4ea0887e 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1769,14 +1769,6 @@ static void sit_route_add(struct net_device *dev)
 }
 #endif
 
-static void addrconf_add_lroute(struct net_device *dev)
-{
-       struct in6_addr addr;
-
-       ipv6_addr_set(&addr,  htonl(0xFE800000), 0, 0, 0);
-       addrconf_prefix_route(&addr, 64, dev, 0, 0);
-}
-
 static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
 {
        struct inet6_dev *idev;
@@ -1794,8 +1786,6 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
        if (!(dev->flags & IFF_LOOPBACK))
                addrconf_add_mroute(dev);
 
-       /* Add link local route */
-       addrconf_add_lroute(dev);
        return idev;
 }
 
@@ -2474,10 +2464,9 @@ static void addrconf_sit_config(struct net_device *dev)
 
        sit_add_v4_addrs(idev);
 
-       if (dev->flags&IFF_POINTOPOINT) {
+       if (dev->flags&IFF_POINTOPOINT)
                addrconf_add_mroute(dev);
-               addrconf_add_lroute(dev);
-       } else
+       else
                sit_route_add(dev);
 }
 #endif