Commit 161980f4 authored by David S. Miller's avatar David S. Miller

[IPV6]: Revert recent change to rt6_check_dev().

This reverts a0d78ebf

It causes pings to link-local addresses to fail.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 254d0d24
...@@ -311,21 +311,12 @@ static inline void rt6_probe(struct rt6_info *rt) ...@@ -311,21 +311,12 @@ static inline void rt6_probe(struct rt6_info *rt)
static inline int rt6_check_dev(struct rt6_info *rt, int oif) static inline int rt6_check_dev(struct rt6_info *rt, int oif)
{ {
struct net_device *dev = rt->rt6i_dev; struct net_device *dev = rt->rt6i_dev;
int ret = 0; if (!oif || dev->ifindex == oif)
if (!oif)
return 2;
if (dev->flags & IFF_LOOPBACK) {
if (!WARN_ON(rt->rt6i_idev == NULL) &&
rt->rt6i_idev->dev->ifindex == oif)
ret = 1;
else
return 0;
}
if (dev->ifindex == oif)
return 2; return 2;
if ((dev->flags & IFF_LOOPBACK) &&
return ret; rt->rt6i_idev && rt->rt6i_idev->dev->ifindex == oif)
return 1;
return 0;
} }
static inline int rt6_check_neigh(struct rt6_info *rt) static inline int rt6_check_neigh(struct rt6_info *rt)
......
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