cfg80211: process non country IE conflicting first

By dealing with non country IE conficts first we can shift
the code that deals with the conflict to the left. This has
no functional changes.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/wireless/reg.c

@@ -1539,11 +1539,14 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
 		return REG_REQ_ALREADY_SET;
 	}
 
-	last_wiphy = wiphy_idx_to_wiphy(lr->wiphy_idx);
-
 	if (unlikely(!is_an_alpha2(country_ie_request->alpha2)))
 		return -EINVAL;
-	if (lr->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+
+	if (lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE)
+		return REG_REQ_OK;
+
+	last_wiphy = wiphy_idx_to_wiphy(lr->wiphy_idx);
+
 	if (last_wiphy != wiphy) {
 		/*
 		 * Two cards with two APs claiming different
@@ -1562,8 +1565,6 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
 	if (WARN_ON(regdom_changes(country_ie_request->alpha2)))
 		return REG_REQ_OK;
 	return REG_REQ_ALREADY_SET;
-	}
-	return REG_REQ_OK;
 }
 
 /**