cfg80211: move reg_is_world_roaming()

This will be used later by other code. This has no
functional change.

Tested-by: Ben Greear <greearb@candelatech.com>
Reported-by: Ben Greear <greearb@candelatech.com>
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2a3ae4d1001dfd7eea61ed117ad821212d63bc5a..b68eeef45e6caf1733f66b3ee0ccb39d34321f3a 100644 (file)
--- a/net/wireless/reg.c
+++ b/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)
 {