Skip to content

Commit

Permalink
cfg80211: avoid reg-hints in self-managed only systems
Browse files Browse the repository at this point in the history
When a system contains only self-managed regulatory devices all hints
from the regulatory core are ignored. Stop hint processing early in this
case. These systems usually don't have CRDA deployed, which results in
endless (irrelevent) logs of the form:
cfg80211: Calling CRDA to update world regulatory domain

Make sure there's at least one self-managed device before discarding a
hint, in order to prevent initial hints from disappearing on CRDA
managed systems.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Arik Nemtsov authored and Johannes Berg committed Jan 14, 2015
1 parent 2c3e861 commit ef51fb1
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2108,6 +2108,26 @@ static void reg_process_hint(struct regulatory_request *reg_request)
reg_free_request(reg_request);
}

static bool reg_only_self_managed_wiphys(void)
{
struct cfg80211_registered_device *rdev;
struct wiphy *wiphy;
bool self_managed_found = false;

ASSERT_RTNL();

list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
wiphy = &rdev->wiphy;
if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED)
self_managed_found = true;
else
return false;
}

/* make sure at least one self-managed wiphy exists */
return self_managed_found;
}

/*
* Processes regulatory hints, this is all the NL80211_REGDOM_SET_BY_*
* Regulatory hints come on a first come first serve basis and we
Expand Down Expand Up @@ -2139,6 +2159,11 @@ static void reg_process_pending_hints(void)

spin_unlock(&reg_requests_lock);

if (reg_only_self_managed_wiphys()) {
reg_free_request(reg_request);
return;
}

reg_process_hint(reg_request);
}

Expand Down

0 comments on commit ef51fb1

Please sign in to comment.