Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'

[karo-tx-linux.git] / net / ipv4 / route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 26a1cb348b3daa42df611ba597c498dba234a4ff..a78540f28276771e4c8f35024d3ee133c31317ab 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1591,7 +1591,7 @@ static int __mkroute_input(struct sk_buff *skb,
 
        fnhe = find_exception(&FIB_RES_NH(*res), daddr);
        if (do_cache) {
-               if (fnhe != NULL)
+               if (fnhe)
                        rth = rcu_dereference(fnhe->fnhe_rth_input);
                else
                        rth = rcu_dereference(FIB_RES_NH(*res).nh_rth_input);