diff options
Diffstat (limited to 'drivers/net/wireless/ath/regd.c')
-rw-r--r-- | drivers/net/wireless/ath/regd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index fdf07c822081..7a89f9fac7d4 100644 --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c | |||
@@ -200,8 +200,10 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy, | |||
200 | continue; | 200 | continue; |
201 | 201 | ||
202 | if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) { | 202 | if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) { |
203 | r = freq_reg_info(wiphy, ch->center_freq, | 203 | r = freq_reg_info(wiphy, |
204 | &bandwidth, ®_rule); | 204 | ch->center_freq, |
205 | bandwidth, | ||
206 | ®_rule); | ||
205 | if (r) | 207 | if (r) |
206 | continue; | 208 | continue; |
207 | /* | 209 | /* |
@@ -265,7 +267,7 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy, | |||
265 | */ | 267 | */ |
266 | 268 | ||
267 | ch = &sband->channels[11]; /* CH 12 */ | 269 | ch = &sband->channels[11]; /* CH 12 */ |
268 | r = freq_reg_info(wiphy, ch->center_freq, &bandwidth, ®_rule); | 270 | r = freq_reg_info(wiphy, ch->center_freq, bandwidth, ®_rule); |
269 | if (!r) { | 271 | if (!r) { |
270 | if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) | 272 | if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) |
271 | if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN) | 273 | if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN) |
@@ -273,7 +275,7 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy, | |||
273 | } | 275 | } |
274 | 276 | ||
275 | ch = &sband->channels[12]; /* CH 13 */ | 277 | ch = &sband->channels[12]; /* CH 13 */ |
276 | r = freq_reg_info(wiphy, ch->center_freq, &bandwidth, ®_rule); | 278 | r = freq_reg_info(wiphy, ch->center_freq, bandwidth, ®_rule); |
277 | if (!r) { | 279 | if (!r) { |
278 | if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) | 280 | if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) |
279 | if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN) | 281 | if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN) |