aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2015-01-07 09:47:20 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-01-14 03:43:44 -0500
commitef51fb1d1cd54ae9e0b0efd3b9bdb561fe5483a0 (patch)
treedbe2e22cd66e684c7bd4128ef140de44ce275952 /net/wireless
parent2c3e861c94a29a30c75f60f2561b4ee70b3fb3a4 (diff)
cfg80211: avoid reg-hints in self-managed only systems
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>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f8ed79729eb0..886cc7cb5566 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2108,6 +2108,26 @@ out_free:
2108 reg_free_request(reg_request); 2108 reg_free_request(reg_request);
2109} 2109}
2110 2110
2111static bool reg_only_self_managed_wiphys(void)
2112{
2113 struct cfg80211_registered_device *rdev;
2114 struct wiphy *wiphy;
2115 bool self_managed_found = false;
2116
2117 ASSERT_RTNL();
2118
2119 list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
2120 wiphy = &rdev->wiphy;
2121 if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED)
2122 self_managed_found = true;
2123 else
2124 return false;
2125 }
2126
2127 /* make sure at least one self-managed wiphy exists */
2128 return self_managed_found;
2129}
2130
2111/* 2131/*
2112 * Processes regulatory hints, this is all the NL80211_REGDOM_SET_BY_* 2132 * Processes regulatory hints, this is all the NL80211_REGDOM_SET_BY_*
2113 * Regulatory hints come on a first come first serve basis and we 2133 * Regulatory hints come on a first come first serve basis and we
@@ -2139,6 +2159,11 @@ static void reg_process_pending_hints(void)
2139 2159
2140 spin_unlock(&reg_requests_lock); 2160 spin_unlock(&reg_requests_lock);
2141 2161
2162 if (reg_only_self_managed_wiphys()) {
2163 reg_free_request(reg_request);
2164 return;
2165 }
2166
2142 reg_process_hint(reg_request); 2167 reg_process_hint(reg_request);
2143} 2168}
2144 2169