Skip to content

Commit

Permalink
cfg80211: move reg_is_world_roaming()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis R. Rodriguez authored and Johannes Berg committed Jan 3, 2013
1 parent 3ebfa6e commit 3195e48
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 3195e48

Please sign in to comment.