Commit 2127d95a authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

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: default avatarIdo Schimmel <idosch@mellanox.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b241361
...@@ -169,6 +169,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev); ...@@ -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_mtu_change(struct net_device *dev, unsigned int mtu);
void rt6_remove_prefsrc(struct inet6_ifaddr *ifp); void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
void rt6_clean_tohost(struct net *net, struct in6_addr *gateway); 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) static inline const struct rt6_info *skb_rt6_info(const struct sk_buff *skb)
{ {
......
...@@ -3484,6 +3484,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, ...@@ -3484,6 +3484,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
if (run_pending) if (run_pending)
addrconf_dad_run(idev); 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, * If the MTU changed during the interface down,
* when the interface up, the changed MTU must be * when the interface up, the changed MTU must be
......
...@@ -3459,6 +3459,35 @@ void rt6_clean_tohost(struct net *net, struct in6_addr *gateway) ...@@ -3459,6 +3459,35 @@ void rt6_clean_tohost(struct net *net, struct in6_addr *gateway)
fib6_clean_all(net, fib6_clean_tohost, 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 arg_dev_net {
struct net_device *dev; struct net_device *dev;
struct net *net; struct net *net;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment