Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / ipv4 / fib_frontend.c

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 741e4fa3e4749e0285c39f65dc306e644fb4032b..cafcc49d0993b6a6b39590f6c2246fc806eb463d 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -275,7 +275,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
        fib_res_put(&res);
        if (no_addr)
                goto last_resort;
-       if (rpf)
+       if (rpf == 1)
                goto e_inval;
        fl.oif = dev->ifindex;