[x86] add BLK_DEV_PIIX symbol needed for Virtual Box.

[openwrt.git] / package / libertas / src / 11d.c

diff --git a/package/libertas/src/11d.c b/package/libertas/src/11d.c
index 5e10ce0..4bc46a6 100644 (file)
--- a/package/libertas/src/11d.c
+++ b/package/libertas/src/11d.c
@@ -79,7 +79,7 @@ static u8 *lbs_code_2_region(u8 code)
  *  @param nrchan   number of channels
  *  @return          the nrchan-th chan number
 */
  *  @param nrchan   number of channels
  *  @return          the nrchan-th chan number
 */

-static u8 lbs_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 *chan)
+static u8 lbs_get_chan_11d(u8 firstchan, u8 nrchan, u8 *chan)

 /*find the nrchan-th chan after the firstchan*/
 {
        u8 i;
 /*find the nrchan-th chan after the firstchan*/
 {
        u8 i;


@@ -134,7 +134,7 @@ static u8 lbs_channel_known_11d(u8 chan,
        return 0;
 }
 
        return 0;
 }
 

-u32 lbs_chan_2_freq(u8 chan, u8 band)
+u32 lbs_chan_2_freq(u8 chan)

 {
        struct chan_freq_power *cf;
        u16 i;
 {
        struct chan_freq_power *cf;
        u16 i;


@@ -264,7 +264,7 @@ static void lbs_generate_parsed_region_chan_11d(struct region_channel *region_ch
  *  @param chan                 chan
  *  @return                    TRUE;FALSE
 */
  *  @param chan                 chan
  *  @return                    TRUE;FALSE
 */

-static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan)
+static u8 lbs_region_chan_supported_11d(u8 region, u8 chan)

 {
        struct chan_freq_power *cfp;
        int cfp_no;
 {
        struct chan_freq_power *cfp;
        int cfp_no;


@@ -273,7 +273,7 @@ static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan)
 
        lbs_deb_enter(LBS_DEB_11D);
 
 
        lbs_deb_enter(LBS_DEB_11D);
 

-       cfp = lbs_get_region_cfp_table(region, band, &cfp_no);
+       cfp = lbs_get_region_cfp_table(region, &cfp_no);

        if (cfp == NULL)
                return 0;
 
        if (cfp == NULL)
                return 0;
 


@@ -367,7 +367,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
                for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) {
                        /*step4: channel is supported? */
 
                for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) {
                        /*step4: channel is supported? */
 

-                       if (!lbs_get_chan_11d(band, firstchan, i, &curchan)) {
+                       if (!lbs_get_chan_11d(firstchan, i, &curchan)) {

                                /* Chan is not found in UN table */
                                lbs_deb_11d("chan is not supported: %d \n", i);
                                break;
                                /* Chan is not found in UN table */
                                lbs_deb_11d("chan is not supported: %d \n", i);
                                break;


@@ -375,8 +375,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
 
                        lastchan = curchan;
 
 
                        lastchan = curchan;
 

-                       if (lbs_region_chan_supported_11d
-                           (region, band, curchan)) {
+                       if (lbs_region_chan_supported_11d(region, curchan)) {

                                /*step5: Check if curchan is supported by mrvl in region */
                                parsed_region_chan->chanpwr[idx].chan = curchan;
                                parsed_region_chan->chanpwr[idx].pwr =
                                /*step5: Check if curchan is supported by mrvl in region */
                                parsed_region_chan->chanpwr[idx].chan = curchan;
                                parsed_region_chan->chanpwr[idx].pwr =


@@ -554,8 +553,7 @@ done:
  *  @param resp    pointer to command response buffer
  *  @return       0; -1
  */
  *  @param resp    pointer to command response buffer
  *  @return       0; -1
  */

-int lbs_ret_802_11d_domain_info(struct lbs_private *priv,
-                                struct cmd_ds_command *resp)
+int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp)

 {
        struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
        struct mrvlietypes_domainparamset *domain = &domaininfo->domain;
 {
        struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
        struct mrvlietypes_domainparamset *domain = &domaininfo->domain;