1 files changed, 40 insertions, 56 deletions

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 62b4c2938608..1c4981367e50 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -724,8 +724,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
         u32 cmd_append_size = 0;
         u32 i;
         u16 tmp_cap;
-        uint16_t ht_cap_info;
         struct mwifiex_ie_types_chan_list_param_set *chan_tlv;
+        u8 radio_type;
 
         struct mwifiex_ie_types_htcap *ht_cap;
         struct mwifiex_ie_types_htinfo *ht_info;
@@ -837,8 +837,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
                 bss_desc->privacy = MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL;
         }
 
-        memset(adhoc_start->DataRate, 0, sizeof(adhoc_start->DataRate));
-        mwifiex_get_active_data_rates(priv, adhoc_start->DataRate);
+        memset(adhoc_start->data_rate, 0, sizeof(adhoc_start->data_rate));
+        mwifiex_get_active_data_rates(priv, adhoc_start->data_rate);
         if ((adapter->adhoc_start_band & BAND_G) &&
             (priv->curr_pkt_filter & HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON)) {
                 if (mwifiex_send_cmd_async(priv, HostCmd_CMD_MAC_CONTROL,
@@ -850,20 +850,19 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
                 }
         }
         /* Find the last non zero */
-        for (i = 0; i < sizeof(adhoc_start->DataRate) &&
-                        adhoc_start->DataRate[i];
-                        i++)
-                        ;
+        for (i = 0; i < sizeof(adhoc_start->data_rate); i++)
+                if (!adhoc_start->data_rate[i])
+                        break;
 
         priv->curr_bss_params.num_of_rates = i;
 
         /* Copy the ad-hoc creating rates into Current BSS rate structure */
         memcpy(&priv->curr_bss_params.data_rates,
-               &adhoc_start->DataRate, priv->curr_bss_params.num_of_rates);
+               &adhoc_start->data_rate, priv->curr_bss_params.num_of_rates);
 
         dev_dbg(adapter->dev, "info: ADHOC_S_CMD: rates=%02x %02x %02x %02x\n",
-               adhoc_start->DataRate[0], adhoc_start->DataRate[1],
-               adhoc_start->DataRate[2], adhoc_start->DataRate[3]);
+               adhoc_start->data_rate[0], adhoc_start->data_rate[1],
+               adhoc_start->data_rate[2], adhoc_start->data_rate[3]);
 
         dev_dbg(adapter->dev, "info: ADHOC_S_CMD: AD-HOC Start command is ready\n");
 
@@ -914,55 +913,40 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
         }
 
         if (adapter->adhoc_11n_enabled) {
-                {
-                        ht_cap = (struct mwifiex_ie_types_htcap *) pos;
-                        memset(ht_cap, 0,
-                               sizeof(struct mwifiex_ie_types_htcap));
-                        ht_cap->header.type =
-                                cpu_to_le16(WLAN_EID_HT_CAPABILITY);
-                        ht_cap->header.len =
-                               cpu_to_le16(sizeof(struct ieee80211_ht_cap));
-                        ht_cap_info = le16_to_cpu(ht_cap->ht_cap.cap_info);
-
-                        ht_cap_info |= IEEE80211_HT_CAP_SGI_20;
-                        if (adapter->chan_offset) {
-                                ht_cap_info |= IEEE80211_HT_CAP_SGI_40;
-                                ht_cap_info |= IEEE80211_HT_CAP_DSSSCCK40;
-                                ht_cap_info |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                                SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
-                        }
+                /* Fill HT CAPABILITY */
+                ht_cap = (struct mwifiex_ie_types_htcap *) pos;
+                memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));
+                ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
+                ht_cap->header.len =
+                       cpu_to_le16(sizeof(struct ieee80211_ht_cap));
+                radio_type = mwifiex_band_to_radio_type(
+                                        priv->adapter->config_bands);
+                mwifiex_fill_cap_info(priv, radio_type, ht_cap);
+
+                pos += sizeof(struct mwifiex_ie_types_htcap);
+                cmd_append_size +=
+                        sizeof(struct mwifiex_ie_types_htcap);
 
-                        ht_cap->ht_cap.ampdu_params_info
-                                        = IEEE80211_HT_MAX_AMPDU_64K;
-                        ht_cap->ht_cap.mcs.rx_mask[0] = 0xff;
-                        pos += sizeof(struct mwifiex_ie_types_htcap);
-                        cmd_append_size +=
-                                sizeof(struct mwifiex_ie_types_htcap);
-                }
-                {
-                        ht_info = (struct mwifiex_ie_types_htinfo *) pos;
-                        memset(ht_info, 0,
-                               sizeof(struct mwifiex_ie_types_htinfo));
-                        ht_info->header.type =
-                                cpu_to_le16(WLAN_EID_HT_INFORMATION);
-                        ht_info->header.len =
-                                cpu_to_le16(sizeof(struct ieee80211_ht_info));
-                        ht_info->ht_info.control_chan =
-                                (u8) priv->curr_bss_params.bss_descriptor.
-                                channel;
-                        if (adapter->chan_offset) {
-                                ht_info->ht_info.ht_param =
-                                        adapter->chan_offset;
-                                ht_info->ht_info.ht_param |=
+                /* Fill HT INFORMATION */
+                ht_info = (struct mwifiex_ie_types_htinfo *) pos;
+                memset(ht_info, 0, sizeof(struct mwifiex_ie_types_htinfo));
+                ht_info->header.type = cpu_to_le16(WLAN_EID_HT_INFORMATION);
+                ht_info->header.len =
+                        cpu_to_le16(sizeof(struct ieee80211_ht_info));
+
+                ht_info->ht_info.control_chan =
+                        (u8) priv->curr_bss_params.bss_descriptor.channel;
+                if (adapter->chan_offset) {
+                        ht_info->ht_info.ht_param = adapter->chan_offset;
+                        ht_info->ht_info.ht_param |=
                                         IEEE80211_HT_PARAM_CHAN_WIDTH_ANY;
-                        }
-                        ht_info->ht_info.operation_mode =
-                             cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
-                        ht_info->ht_info.basic_set[0] = 0xff;
-                        pos += sizeof(struct mwifiex_ie_types_htinfo);
-                        cmd_append_size +=
-                                sizeof(struct mwifiex_ie_types_htinfo);
                 }
+                ht_info->ht_info.operation_mode =
+                     cpu_to_le16(IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
+                ht_info->ht_info.basic_set[0] = 0xff;
+                pos += sizeof(struct mwifiex_ie_types_htinfo);
+                cmd_append_size +=
+                        sizeof(struct mwifiex_ie_types_htinfo);
         }
 
         cmd->size = cpu_to_le16((u16)