From: Roy Marples <roy@marples.name>
Date: Tue, 15 Sep 2015 11:01:26 +0000 (+0000)
Subject: Rationalise test order.
X-Git-Tag: v6.9.4~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baddcd45dfd8e4d41e7b4c7fb1586bbd36fed87e;p=thirdparty%2Fdhcpcd.git

Rationalise test order.
---

diff --git a/ipv4.c b/ipv4.c
index 021d51ef..7b9fa1a1 100644
--- a/ipv4.c
+++ b/ipv4.c
@@ -752,11 +752,11 @@ ipv4_doroute(struct rt *rt, struct rt_head *nrs)
 		if (or->state & STATE_FAKE ||
 		    or->iface != rt->iface ||
 #ifdef HAVE_ROUTE_METRIC
-		    rt->metric != or->metric ||
+		    or->metric != rt->metric ||
 #endif
-		    rt->src.s_addr != or->src.s_addr ||
-		    rt->gate.s_addr != or->gate.s_addr ||
-		    rt->mtu != or->mtu)
+		    or->src.s_addr != rt->src.s_addr ||
+		    or->gate.s_addr != rt->gate.s_addr ||
+		    or->mtu != rt->mtu)
 		{
 			if (c_route(or, rt) != 0)
 				return 0;