---

yaml
---
r: 351759
b: refs/heads/master
c: 3195e48
h: refs/heads/master
i:
  351757: 108d28b
  351755: 8cf216f
  351751: 06837fd
  351743: b06b4f0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ebfa6e76beab01e644e1facd5fdb84d4274043e
+refs/heads/master: 3195e489a878aaa3b735d4a1b7c5c79b3786efed

trunk/net/wireless/reg.c

@@ -1009,6 +1009,22 @@ static bool ignore_reg_update(struct wiphy *wiphy,
 	return false;
 }
 
+static bool reg_is_world_roaming(struct wiphy *wiphy)
+{
+	const struct ieee80211_regdomain *cr = get_cfg80211_regdom();
+	const struct ieee80211_regdomain *wr = get_wiphy_regdom(wiphy);
+	struct regulatory_request *lr = get_last_request();
+
+	if (is_world_regdom(cr->alpha2) || (wr && is_world_regdom(wr->alpha2)))
+		return true;
+
+	if (lr && lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+	    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)
+		return true;
+
+	return false;
+}
+
 static void handle_reg_beacon(struct wiphy *wiphy, unsigned int chan_idx,
 			      struct reg_beacon *reg_beacon)
 {
@@ -1085,22 +1101,6 @@ static void wiphy_update_beacon_reg(struct wiphy *wiphy)
 	}
 }
 
-static bool reg_is_world_roaming(struct wiphy *wiphy)
-{
-	const struct ieee80211_regdomain *cr = get_cfg80211_regdom();
-	const struct ieee80211_regdomain *wr = get_wiphy_regdom(wiphy);
-	struct regulatory_request *lr = get_last_request();
-
-	if (is_world_regdom(cr->alpha2) || (wr && is_world_regdom(wr->alpha2)))
-		return true;
-
-	if (lr && lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-	    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)
-		return true;
-
-	return false;
-}
-
 /* Reap the advantages of previously found beacons */
 static void reg_process_beacons(struct wiphy *wiphy)
 {