diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-03-30 22:30:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:38 -0400 |
commit | 6b2b2ffbef7750e51bfa74e92229ecee10b59307 (patch) | |
tree | 36fc8be51fccb131c398c897ba6ebef8084086d2 /drivers/net/wireless | |
parent | 203c4805e91786f9a010bc7945a0fde70c9da28e (diff) |
ath: space cleanup
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/regd.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index 3ccf21cceb5a..4b5c851b81ff 100644 --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c | |||
@@ -173,9 +173,9 @@ static bool ath_is_radar_freq(u16 center_freq) | |||
173 | * received a beacon on a channel we can enable active scan and | 173 | * received a beacon on a channel we can enable active scan and |
174 | * adhoc (or beaconing). | 174 | * adhoc (or beaconing). |
175 | */ | 175 | */ |
176 | static void ath_reg_apply_beaconing_flags( | 176 | static void |
177 | struct wiphy *wiphy, | 177 | ath_reg_apply_beaconing_flags(struct wiphy *wiphy, |
178 | enum nl80211_reg_initiator initiator) | 178 | enum nl80211_reg_initiator initiator) |
179 | { | 179 | { |
180 | enum ieee80211_band band; | 180 | enum ieee80211_band band; |
181 | struct ieee80211_supported_band *sband; | 181 | struct ieee80211_supported_band *sband; |
@@ -232,9 +232,9 @@ static void ath_reg_apply_beaconing_flags( | |||
232 | } | 232 | } |
233 | 233 | ||
234 | /* Allows active scan scan on Ch 12 and 13 */ | 234 | /* Allows active scan scan on Ch 12 and 13 */ |
235 | static void ath_reg_apply_active_scan_flags( | 235 | static void |
236 | struct wiphy *wiphy, | 236 | ath_reg_apply_active_scan_flags(struct wiphy *wiphy, |
237 | enum nl80211_reg_initiator initiator) | 237 | enum nl80211_reg_initiator initiator) |
238 | { | 238 | { |
239 | struct ieee80211_supported_band *sband; | 239 | struct ieee80211_supported_band *sband; |
240 | struct ieee80211_channel *ch; | 240 | struct ieee80211_channel *ch; |
@@ -316,8 +316,8 @@ static void ath_reg_apply_radar_flags(struct wiphy *wiphy) | |||
316 | } | 316 | } |
317 | 317 | ||
318 | static void ath_reg_apply_world_flags(struct wiphy *wiphy, | 318 | static void ath_reg_apply_world_flags(struct wiphy *wiphy, |
319 | enum nl80211_reg_initiator initiator, | 319 | enum nl80211_reg_initiator initiator, |
320 | struct ath_regulatory *reg) | 320 | struct ath_regulatory *reg) |
321 | { | 321 | { |
322 | switch (reg->regpair->regDmnEnum) { | 322 | switch (reg->regpair->regDmnEnum) { |
323 | case 0x60: | 323 | case 0x60: |
@@ -335,7 +335,8 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy, | |||
335 | } | 335 | } |
336 | 336 | ||
337 | int ath_reg_notifier_apply(struct wiphy *wiphy, | 337 | int ath_reg_notifier_apply(struct wiphy *wiphy, |
338 | struct regulatory_request *request, struct ath_regulatory *reg) | 338 | struct regulatory_request *request, |
339 | struct ath_regulatory *reg) | ||
339 | { | 340 | { |
340 | /* We always apply this */ | 341 | /* We always apply this */ |
341 | ath_reg_apply_radar_flags(wiphy); | 342 | ath_reg_apply_radar_flags(wiphy); |
@@ -433,8 +434,10 @@ ath_get_regpair(int regdmn) | |||
433 | return NULL; | 434 | return NULL; |
434 | } | 435 | } |
435 | 436 | ||
436 | static int ath_regd_init_wiphy(struct ath_regulatory *reg, struct wiphy *wiphy, | 437 | static int |
437 | int (*reg_notifier)(struct wiphy *wiphy, | 438 | ath_regd_init_wiphy(struct ath_regulatory *reg, |
439 | struct wiphy *wiphy, | ||
440 | int (*reg_notifier)(struct wiphy *wiphy, | ||
438 | struct regulatory_request *request)) | 441 | struct regulatory_request *request)) |
439 | { | 442 | { |
440 | const struct ieee80211_regdomain *regd; | 443 | const struct ieee80211_regdomain *regd; |
@@ -464,9 +467,11 @@ static int ath_regd_init_wiphy(struct ath_regulatory *reg, struct wiphy *wiphy, | |||
464 | return 0; | 467 | return 0; |
465 | } | 468 | } |
466 | 469 | ||
467 | int ath_regd_init(struct ath_regulatory *reg, struct wiphy *wiphy, | 470 | int |
468 | int (*reg_notifier)(struct wiphy *wiphy, | 471 | ath_regd_init(struct ath_regulatory *reg, |
469 | struct regulatory_request *request)) | 472 | struct wiphy *wiphy, |
473 | int (*reg_notifier)(struct wiphy *wiphy, | ||
474 | struct regulatory_request *request)) | ||
470 | { | 475 | { |
471 | struct country_code_to_enum_rd *country = NULL; | 476 | struct country_code_to_enum_rd *country = NULL; |
472 | u16 regdmn; | 477 | u16 regdmn; |