From: Roy Marples <roy@marples.name>
Date: Tue, 20 Mar 2012 13:59:41 +0000 (+0000)
Subject: Fix an issue where we would only use a CSR if we had not warned about using it.
X-Git-Tag: v5.5.5~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbcc6643e118ec51abf869852ecd0393e72ba4bc;p=thirdparty%2Fdhcpcd.git

Fix an issue where we would only use a CSR if we had not warned about using it.
---

diff --git a/dhcp.c b/dhcp.c
index cfbc2a0e..91a60092 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -792,8 +792,8 @@ get_option_routes(const struct dhcp_message *dhcp,
 			    "%s: using Classless Static Routes (RFC3442)",
 			    ifname);
 			*opts |= DHCPCD_CSR_WARNED;
-			return routes;
 		}
+		return routes;
 	}
 
 	/* OK, get our static routes first. */