diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-04-06 20:42:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-06 20:42:27 +0200 |
| commit | 161980f4c6b846625efe6227420175cb41477de3 (patch) | |
| tree | 689e343519191d02624b377c7d2fccb2a76852cf | |
| parent | [XFRM]: beet: fix IP option decapsulation (diff) | |
| download | linux-161980f4c6b846625efe6227420175cb41477de3.tar.xz linux-161980f4c6b846625efe6227420175cb41477de3.zip | |
[IPV6]: Revert recent change to rt6_check_dev().
This reverts a0d78ebf3a0e33a1aeacf2fc518ad9273d6a1c2f
It causes pings to link-local addresses to fail.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/route.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 3931b33b25e8..ad9b285692ba 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -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) { struct net_device *dev = rt->rt6i_dev; - int ret = 0; - - 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) + if (!oif || dev->ifindex == oif) return 2; - - return ret; + if ((dev->flags & IFF_LOOPBACK) && + rt->rt6i_idev && rt->rt6i_idev->dev->ifindex == oif) + return 1; + return 0; } static inline int rt6_check_neigh(struct rt6_info *rt) |