ipv6: Clear nexthop flags upon netdev up

Previous patch marked nexthops with the 'dead' and 'linkdown' flags.
Clear these flags when the netdev comes back up.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 18e442ea93d832c481576903ab7e78d7f80fa6d7..caad39198c2acc29b36155fe67c159d24c683f57 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -169,6 +169,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev);
 void rt6_mtu_change(struct net_device *dev, unsigned int mtu);
 void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
 void rt6_clean_tohost(struct net *net, struct in6_addr *gateway);
+void rt6_sync_up(struct net_device *dev, unsigned int nh_flags);
 
 static inline const struct rt6_info *skb_rt6_info(const struct sk_buff *skb)
 {

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ed06b1190f05b849c595b56ff110948735583b3c..b6405568ed7b97c3afc0984f334daca2bdce266c 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3484,6 +3484,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                        if (run_pending)
                                addrconf_dad_run(idev);
 
+                       /* Device has an address by now */
+                       rt6_sync_up(dev, RTNH_F_DEAD);
+
                        /*
                         * If the MTU changed during the interface down,
                         * when the interface up, the changed MTU must be

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f5eda0aeab55f119ad09bdfbb6a677ceb90fce95..4796d87e0b937b19f4df8b42e4a9d86d38f4db58 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3459,6 +3459,35 @@ void rt6_clean_tohost(struct net *net, struct in6_addr *gateway)
        fib6_clean_all(net, fib6_clean_tohost, gateway);
 }
 
+struct arg_netdev_event {
+       const struct net_device *dev;
+       unsigned int nh_flags;
+};
+
+static int fib6_ifup(struct rt6_info *rt, void *p_arg)
+{
+       const struct arg_netdev_event *arg = p_arg;
+       const struct net *net = dev_net(arg->dev);
+
+       if (rt != net->ipv6.ip6_null_entry && rt->dst.dev == arg->dev)
+               rt->rt6i_nh_flags &= ~arg->nh_flags;
+
+       return 0;
+}
+
+void rt6_sync_up(struct net_device *dev, unsigned int nh_flags)
+{
+       struct arg_netdev_event arg = {
+               .dev = dev,
+               .nh_flags = nh_flags,
+       };
+
+       if (nh_flags & RTNH_F_DEAD && netif_carrier_ok(dev))
+               arg.nh_flags |= RTNH_F_LINKDOWN;
+
+       fib6_clean_all(dev_net(dev), fib6_ifup, &arg);
+}
+
 struct arg_dev_net {
        struct net_device *dev;
        struct net *net;