diff options
Diffstat (limited to 'drivers/net/wireless/libertas/11d.c')
-rw-r--r-- | drivers/net/wireless/libertas/11d.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/11d.c b/drivers/net/wireless/libertas/11d.c index 5e10ce0d351c..4bc46a60ae2f 100644 --- a/drivers/net/wireless/libertas/11d.c +++ b/drivers/net/wireless/libertas/11d.c | |||
@@ -79,7 +79,7 @@ static u8 *lbs_code_2_region(u8 code) | |||
79 | * @param nrchan number of channels | 79 | * @param nrchan number of channels |
80 | * @return the nrchan-th chan number | 80 | * @return the nrchan-th chan number |
81 | */ | 81 | */ |
82 | static u8 lbs_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 *chan) | 82 | static u8 lbs_get_chan_11d(u8 firstchan, u8 nrchan, u8 *chan) |
83 | /*find the nrchan-th chan after the firstchan*/ | 83 | /*find the nrchan-th chan after the firstchan*/ |
84 | { | 84 | { |
85 | u8 i; | 85 | u8 i; |
@@ -134,7 +134,7 @@ static u8 lbs_channel_known_11d(u8 chan, | |||
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | u32 lbs_chan_2_freq(u8 chan, u8 band) | 137 | u32 lbs_chan_2_freq(u8 chan) |
138 | { | 138 | { |
139 | struct chan_freq_power *cf; | 139 | struct chan_freq_power *cf; |
140 | u16 i; | 140 | u16 i; |
@@ -264,7 +264,7 @@ static void lbs_generate_parsed_region_chan_11d(struct region_channel *region_ch | |||
264 | * @param chan chan | 264 | * @param chan chan |
265 | * @return TRUE;FALSE | 265 | * @return TRUE;FALSE |
266 | */ | 266 | */ |
267 | static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan) | 267 | static u8 lbs_region_chan_supported_11d(u8 region, u8 chan) |
268 | { | 268 | { |
269 | struct chan_freq_power *cfp; | 269 | struct chan_freq_power *cfp; |
270 | int cfp_no; | 270 | int cfp_no; |
@@ -273,7 +273,7 @@ static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan) | |||
273 | 273 | ||
274 | lbs_deb_enter(LBS_DEB_11D); | 274 | lbs_deb_enter(LBS_DEB_11D); |
275 | 275 | ||
276 | cfp = lbs_get_region_cfp_table(region, band, &cfp_no); | 276 | cfp = lbs_get_region_cfp_table(region, &cfp_no); |
277 | if (cfp == NULL) | 277 | if (cfp == NULL) |
278 | return 0; | 278 | return 0; |
279 | 279 | ||
@@ -367,7 +367,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset* | |||
367 | for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) { | 367 | for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) { |
368 | /*step4: channel is supported? */ | 368 | /*step4: channel is supported? */ |
369 | 369 | ||
370 | if (!lbs_get_chan_11d(band, firstchan, i, &curchan)) { | 370 | if (!lbs_get_chan_11d(firstchan, i, &curchan)) { |
371 | /* Chan is not found in UN table */ | 371 | /* Chan is not found in UN table */ |
372 | lbs_deb_11d("chan is not supported: %d \n", i); | 372 | lbs_deb_11d("chan is not supported: %d \n", i); |
373 | break; | 373 | break; |
@@ -375,8 +375,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset* | |||
375 | 375 | ||
376 | lastchan = curchan; | 376 | lastchan = curchan; |
377 | 377 | ||
378 | if (lbs_region_chan_supported_11d | 378 | if (lbs_region_chan_supported_11d(region, curchan)) { |
379 | (region, band, curchan)) { | ||
380 | /*step5: Check if curchan is supported by mrvl in region */ | 379 | /*step5: Check if curchan is supported by mrvl in region */ |
381 | parsed_region_chan->chanpwr[idx].chan = curchan; | 380 | parsed_region_chan->chanpwr[idx].chan = curchan; |
382 | parsed_region_chan->chanpwr[idx].pwr = | 381 | parsed_region_chan->chanpwr[idx].pwr = |
@@ -554,8 +553,7 @@ done: | |||
554 | * @param resp pointer to command response buffer | 553 | * @param resp pointer to command response buffer |
555 | * @return 0; -1 | 554 | * @return 0; -1 |
556 | */ | 555 | */ |
557 | int lbs_ret_802_11d_domain_info(struct lbs_private *priv, | 556 | int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp) |
558 | struct cmd_ds_command *resp) | ||
559 | { | 557 | { |
560 | struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp; | 558 | struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp; |
561 | struct mrvlietypes_domainparamset *domain = &domaininfo->domain; | 559 | struct mrvlietypes_domainparamset *domain = &domaininfo->domain; |