1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/net/wireless/libertas/11d.c b/drivers/net/wireless/libertas/11d.c
index 4bc46a60ae2f..9a5408e7d94a 100644
--- a/drivers/net/wireless/libertas/11d.c
+++ b/drivers/net/wireless/libertas/11d.c
@@ -207,7 +207,7 @@ static int generate_domain_info_11d(struct parsed_region_chan_11d
         lbs_deb_11d("nr_subband=%x\n", domaininfo->nr_subband);
         lbs_deb_hex(LBS_DEB_11D, "domaininfo", (char *)domaininfo,
                 COUNTRY_CODE_LEN + 1 +
-                sizeof(struct ieeetypes_subbandset) * nr_subband);
+                sizeof(struct ieee_subbandset) * nr_subband);
         return 0;
 }
 
@@ -302,11 +302,9 @@ done:
  *  @param parsed_region_chan   pointer to parsed_region_chan_11d
  *  @return                     0
 */
-static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
-                                 countryinfo,
+static int parse_domain_info_11d(struct ieee_ie_country_info_full_set *countryinfo,
                                  u8 band,
-                                 struct parsed_region_chan_11d *
-                                 parsed_region_chan)
+                                 struct parsed_region_chan_11d *parsed_region_chan)
 {
         u8 nr_subband, nrchan;
         u8 lastchan, firstchan;
@@ -331,7 +329,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
         lbs_deb_hex(LBS_DEB_11D, "countryinfo", (u8 *) countryinfo, 30);
 
         if ((*(countryinfo->countrycode)) == 0
-            || (countryinfo->len <= COUNTRY_CODE_LEN)) {
+            || (countryinfo->header.len <= COUNTRY_CODE_LEN)) {
                 /* No region Info or Wrong region info: treat as No 11D info */
                 goto done;
         }
@@ -349,8 +347,8 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
         memcpy(parsed_region_chan->countrycode, countryinfo->countrycode,
                COUNTRY_CODE_LEN);
 
-        nr_subband = (countryinfo->len - COUNTRY_CODE_LEN) /
-            sizeof(struct ieeetypes_subbandset);
+        nr_subband = (countryinfo->header.len - COUNTRY_CODE_LEN) /
+            sizeof(struct ieee_subbandset);
 
         for (j = 0, lastchan = 0; j < nr_subband; j++) {
 
@@ -502,7 +500,7 @@ int lbs_cmd_802_11d_domain_info(struct lbs_private *priv,
 {
         struct cmd_ds_802_11d_domain_info *pdomaininfo =
             &cmd->params.domaininfo;
-        struct mrvlietypes_domainparamset *domain = &pdomaininfo->domain;
+        struct mrvl_ie_domain_param_set *domain = &pdomaininfo->domain;
         u8 nr_subband = priv->domainreg.nr_subband;
 
         lbs_deb_enter(LBS_DEB_11D);
@@ -524,16 +522,16 @@ int lbs_cmd_802_11d_domain_info(struct lbs_private *priv,
                sizeof(domain->countrycode));
 
         domain->header.len =
-            cpu_to_le16(nr_subband * sizeof(struct ieeetypes_subbandset) +
+            cpu_to_le16(nr_subband * sizeof(struct ieee_subbandset) +
                              sizeof(domain->countrycode));
 
         if (nr_subband) {
                 memcpy(domain->subband, priv->domainreg.subband,
-                       nr_subband * sizeof(struct ieeetypes_subbandset));
+                       nr_subband * sizeof(struct ieee_subbandset));
 
                 cmd->size = cpu_to_le16(sizeof(pdomaininfo->action) +
                                              le16_to_cpu(domain->header.len) +
-                                             sizeof(struct mrvlietypesheader) +
+                                             sizeof(struct mrvl_ie_header) +
                                              S_DS_GEN);
         } else {
                 cmd->size =
@@ -556,7 +554,7 @@ done:
 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 mrvl_ie_domain_param_set *domain = &domaininfo->domain;
         u16 action = le16_to_cpu(domaininfo->action);
         s16 ret = 0;
         u8 nr_subband = 0;
@@ -567,7 +565,7 @@ int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp)
                 (int)le16_to_cpu(resp->size));
 
         nr_subband = (le16_to_cpu(domain->header.len) - COUNTRY_CODE_LEN) /
-                      sizeof(struct ieeetypes_subbandset);
+                      sizeof(struct ieee_subbandset);
 
         lbs_deb_11d("domain info resp: nr_subband %d\n", nr_subband);