aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/regd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/regd.c')
-rw-r--r--drivers/net/wireless/ath/regd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index d81698015bf7..8ae58c404c67 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -195,7 +195,6 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy,
195 const struct ieee80211_reg_rule *reg_rule; 195 const struct ieee80211_reg_rule *reg_rule;
196 struct ieee80211_channel *ch; 196 struct ieee80211_channel *ch;
197 unsigned int i; 197 unsigned int i;
198 u32 bandwidth = 0;
199 int r; 198 int r;
200 199
201 for (band = 0; band < IEEE80211_NUM_BANDS; band++) { 200 for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
@@ -216,7 +215,6 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy,
216 if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) { 215 if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
217 r = freq_reg_info(wiphy, 216 r = freq_reg_info(wiphy,
218 ch->center_freq, 217 ch->center_freq,
219 bandwidth,
220 &reg_rule); 218 &reg_rule);
221 if (r) 219 if (r)
222 continue; 220 continue;
@@ -254,7 +252,6 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
254 struct ieee80211_supported_band *sband; 252 struct ieee80211_supported_band *sband;
255 struct ieee80211_channel *ch; 253 struct ieee80211_channel *ch;
256 const struct ieee80211_reg_rule *reg_rule; 254 const struct ieee80211_reg_rule *reg_rule;
257 u32 bandwidth = 0;
258 int r; 255 int r;
259 256
260 sband = wiphy->bands[IEEE80211_BAND_2GHZ]; 257 sband = wiphy->bands[IEEE80211_BAND_2GHZ];
@@ -283,7 +280,7 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
283 */ 280 */
284 281
285 ch = &sband->channels[11]; /* CH 12 */ 282 ch = &sband->channels[11]; /* CH 12 */
286 r = freq_reg_info(wiphy, ch->center_freq, bandwidth, &reg_rule); 283 r = freq_reg_info(wiphy, ch->center_freq, &reg_rule);
287 if (!r) { 284 if (!r) {
288 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) 285 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
289 if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN) 286 if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
@@ -291,7 +288,7 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
291 } 288 }
292 289
293 ch = &sband->channels[12]; /* CH 13 */ 290 ch = &sband->channels[12]; /* CH 13 */
294 r = freq_reg_info(wiphy, ch->center_freq, bandwidth, &reg_rule); 291 r = freq_reg_info(wiphy, ch->center_freq, &reg_rule);
295 if (!r) { 292 if (!r) {
296 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) 293 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
297 if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN) 294 if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)