From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 4 May 2009 12:32:24 +0000 (+0200)
Subject: rearrange some tests to be clearer
X-Git-Tag: v0.9.14~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ddf11ebe3cfaab8b5e426c9e4ae1b50ccfcc3d4;p=thirdparty%2Fiw.git

rearrange some tests to be clearer
---

diff --git a/scan.c b/scan.c
index 4d94e45..9b58c29 100644
--- a/scan.c
+++ b/scan.c
@@ -63,15 +63,15 @@ static int handle_scan(struct nl80211_state *state,
 	}
 
 	for (i = 0; i < argc; i++) {
-		if (strcmp(argv[i], "freq") == 0 && parse == NONE) {
+		if (parse == NONE && strcmp(argv[i], "freq") == 0) {
 			parse = FREQ;
 			have_freqs = true;
 			continue;
-		} else if (strcmp(argv[i], "ssid") == 0 && parse < SSID) {
+		} else if (parse < SSID && strcmp(argv[i], "ssid") == 0) {
 			parse = SSID;
 			have_ssids = true;
 			continue;
-		} else if (strcmp(argv[i], "passive") == 0 && parse < SSID) {
+		} else if (parse < SSID && strcmp(argv[i], "passive") == 0) {
 			parse = DONE;
 			passive = true;
 			continue;