Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / net / ipv4 / fib_semantics.c

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index e9f56225e53fde93a5470ee32c26b21b99ca4655..388d3e21629b17b9a212234352ac7644da4fb7d6 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1580,7 +1580,8 @@ static bool fib_good_nh(const struct fib_nh *nh)
 
                rcu_read_lock_bh();
 
-               n = __ipv4_neigh_lookup_noref(nh->nh_dev, nh->nh_gw);
+               n = __ipv4_neigh_lookup_noref(nh->nh_dev,
+                                             (__force u32)nh->nh_gw);
                if (n)
                        state = n->nud_state;