diff options
| author | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | 2011-10-11 10:59:03 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-21 16:20:41 -0500 |
| commit | b68e6b3b33b208c5690355fd9804ea65cc53d3a5 (patch) | |
| tree | 0a7e3e90519d9dfaeb1c79de176172940be553a3 | |
| parent | 8b60b07805d557542160d852874fa6a1b969184e (diff) | |
| download | linux-stable-b68e6b3b33b208c5690355fd9804ea65cc53d3a5.tar.gz linux-stable-b68e6b3b33b208c5690355fd9804ea65cc53d3a5.tar.bz2 linux-stable-b68e6b3b33b208c5690355fd9804ea65cc53d3a5.zip | |
cfg80211: pass DFS region to drivers through reg_notifier()
This grants drivers access to the DFS region that a
regulatory domain belongs to.
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | include/net/regulatory.h | 5 | ||||
| -rw-r--r-- | net/wireless/reg.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index 7399c93cb4bc..a5f79933e211 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -48,6 +48,10 @@ enum environment_cap { * 99 - built by driver but a specific alpha2 cannot be determined * 98 - result of an intersection between two regulatory domains * 97 - regulatory domain has not yet been configured + * @dfs_region: If CRDA responded with a regulatory domain that requires + * DFS master operation on a known DFS region (NL80211_DFS_*), + * dfs_region represents that region. Drivers can use this and the + * @alpha2 to adjust their device's DFS parameters as required. * @intersect: indicates whether the wireless core should intersect * the requested regulatory domain with the presently set regulatory * domain. @@ -67,6 +71,7 @@ struct regulatory_request { int wiphy_idx; enum nl80211_reg_initiator initiator; char alpha2[2]; + u8 dfs_region; bool intersect; bool processed; enum environment_cap country_ie_env; diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 69141ed1f6df..b66444d048d5 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1121,6 +1121,8 @@ static void wiphy_update_regulatory(struct wiphy *wiphy, if (ignore_reg_update(wiphy, initiator)) return; + last_request->dfs_region = cfg80211_regdomain->dfs_region; + for (band = 0; band < IEEE80211_NUM_BANDS; band++) { if (wiphy->bands[band]) handle_band(wiphy, band, initiator); |