1 files changed, 9 insertions, 29 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 5658d9d51637..12c97d8aa6bb 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1996,23 +1996,6 @@ static void addrconf_add_mroute(struct net_device *dev)
         ip6_route_add(&cfg);
 }
 
-#if IS_ENABLED(CONFIG_IPV6_SIT)
-static void sit_route_add(struct net_device *dev)
-{
-        struct fib6_config cfg = {
-                .fc_table = RT6_TABLE_MAIN,
-                .fc_metric = IP6_RT_PRIO_ADDRCONF,
-                .fc_ifindex = dev->ifindex,
-                .fc_dst_len = 96,
-                .fc_flags = RTF_UP | RTF_NONEXTHOP,
-                .fc_nlinfo.nl_net = dev_net(dev),
-        };
-
-        /* prefix length - 96 bits "::d.d.d.d" */
-        ip6_route_add(&cfg);
-}
-#endif
-
 static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
 {
         struct inet6_dev *idev;
@@ -2542,7 +2525,8 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
         struct in6_addr addr;
         struct net_device *dev;
         struct net *net = dev_net(idev->dev);
-        int scope;
+        int scope, plen;
+        u32 pflags = 0;
 
         ASSERT_RTNL();
 
@@ -2552,12 +2536,16 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
         if (idev->dev->flags&IFF_POINTOPOINT) {
                 addr.s6_addr32[0] = htonl(0xfe800000);
                 scope = IFA_LINK;
+                plen = 64;
         } else {
                 scope = IPV6_ADDR_COMPATv4;
+                plen = 96;
+                pflags |= RTF_NONEXTHOP;
         }
 
         if (addr.s6_addr32[3]) {
-                add_addr(idev, &addr, 128, scope);
+                add_addr(idev, &addr, plen, scope);
+                addrconf_prefix_route(&addr, plen, idev->dev, 0, pflags);
                 return;
         }
 
@@ -2569,7 +2557,6 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
                         int flag = scope;
 
                         for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
-                                int plen;
 
                                 addr.s6_addr32[3] = ifa->ifa_local;
 
@@ -2580,12 +2567,10 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
                                                 continue;
                                         flag |= IFA_HOST;
                                 }
-                                if (idev->dev->flags&IFF_POINTOPOINT)
-                                        plen = 64;
-                                else
-                                        plen = 96;
 
                                 add_addr(idev, &addr, plen, flag);
+                                addrconf_prefix_route(&addr, plen, idev->dev, 0,
+                                                      pflags);
                         }
                 }
         }
@@ -2711,7 +2696,6 @@ static void addrconf_sit_config(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);
                 if (!ipv6_generate_eui64(addr.s6_addr + 8, dev))
                         addrconf_add_linklocal(idev, &addr);
                 return;
@@ -2721,8 +2705,6 @@ static void addrconf_sit_config(struct net_device *dev)
 
         if (dev->flags&IFF_POINTOPOINT)
                 addrconf_add_mroute(dev);
-        else
-                sit_route_add(dev);
 }
 #endif
 
@@ -2740,8 +2722,6 @@ static void addrconf_gre_config(struct net_device *dev)
         }
 
         ipv6_addr_set(&addr,  htonl(0xFE800000), 0, 0, 0);
-        addrconf_prefix_route(&addr, 64, dev, 0, 0);
-
         if (!ipv6_generate_eui64(addr.s6_addr + 8, dev))
                 addrconf_add_linklocal(idev, &addr);
 }