Merge commit 'v2.6.26-rc8' into core/rcu

[linux-2.6] / net / ipv4 / route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index df41026b60db20347538fcdb130841f08f48ca39..96be336064fb1f5f3851cb440a051e2c190de617 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1792,7 +1792,7 @@ static int __mkroute_input(struct sk_buff *skb,
        if (err)
                flags |= RTCF_DIRECTSRC;
 
-       if (out_dev == in_dev && err && !(flags & RTCF_MASQ) &&
+       if (out_dev == in_dev && err &&
            (IN_DEV_SHARED_MEDIA(out_dev) ||
             inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
                flags |= RTCF_DOREDIRECT;