1 files changed, 48 insertions, 23 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index e90c34d9c63d..40e025da6bc2 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -498,7 +498,8 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv,
 {
         struct host_cmd_ds_802_11_key_material *key_material =
                 &cmd->params.key_material;
-        u16 key_param_len = 0;
+        struct host_cmd_tlv_mac_addr *tlv_mac;
+        u16 key_param_len = 0, cmd_size;
         int ret = 0;
         const u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
@@ -614,11 +615,26 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv,
                         cpu_to_le16((u16) enc_key->key_len +
                                     KEYPARAMSET_FIXED_LEN);
 
-                key_param_len = (u16) (enc_key->key_len + KEYPARAMSET_FIXED_LEN)
+                key_param_len = (u16)(enc_key->key_len + KEYPARAMSET_FIXED_LEN)
                                 + sizeof(struct mwifiex_ie_types_header);
 
                 cmd->size = cpu_to_le16(sizeof(key_material->action) + S_DS_GEN
                                         + key_param_len);
+
+                if (priv->bss_type == MWIFIEX_BSS_TYPE_UAP) {
+                        tlv_mac = (void *)((u8 *)&key_material->key_param_set +
+                                           key_param_len);
+                        tlv_mac->tlv.type = cpu_to_le16(TLV_TYPE_STA_MAC_ADDR);
+                        tlv_mac->tlv.len = cpu_to_le16(ETH_ALEN);
+                        memcpy(tlv_mac->mac_addr, enc_key->mac_addr, ETH_ALEN);
+                        cmd_size = key_param_len + S_DS_GEN +
+                                   sizeof(key_material->action) +
+                                   sizeof(struct host_cmd_tlv_mac_addr);
+                } else {
+                        cmd_size = key_param_len + S_DS_GEN +
+                                   sizeof(key_material->action);
+                }
+                cmd->size = cpu_to_le16(cmd_size);
         }
 
         return ret;
@@ -988,7 +1004,7 @@ mwifiex_cmd_802_11_subsc_evt(struct mwifiex_private *priv,
                 rssi_tlv->abs_value = subsc_evt_cfg->bcn_h_rssi_cfg.abs_value;
                 rssi_tlv->evt_freq = subsc_evt_cfg->bcn_h_rssi_cfg.evt_freq;
 
-                dev_dbg(priv->adapter->dev, "Cfg Beacon Low Rssi event, "
+                dev_dbg(priv->adapter->dev, "Cfg Beacon High Rssi event, "
                         "RSSI:-%d dBm, Freq:%d\n",
                         subsc_evt_cfg->bcn_h_rssi_cfg.abs_value,
                         subsc_evt_cfg->bcn_h_rssi_cfg.evt_freq);
@@ -1248,13 +1264,15 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
                 if (ret)
                         return -1;
 
-                /* Enable IEEE PS by default */
-                priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
-                ret = mwifiex_send_cmd_async(priv,
-                                             HostCmd_CMD_802_11_PS_MODE_ENH,
-                                             EN_AUTO_PS, BITMAP_STA_PS, NULL);
-                if (ret)
-                        return -1;
+                if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
+                        /* Enable IEEE PS by default */
+                        priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
+                        ret = mwifiex_send_cmd_async(
+                                        priv, HostCmd_CMD_802_11_PS_MODE_ENH,
+                                        EN_AUTO_PS, BITMAP_STA_PS, NULL);
+                        if (ret)
+                                return -1;
+                }
         }
 
         /* get tx rate */
@@ -1270,12 +1288,14 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         if (ret)
                 return -1;
 
-        /* set ibss coalescing_status */
-        ret = mwifiex_send_cmd_async(priv,
-                                     HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
-                                     HostCmd_ACT_GEN_SET, 0, &enable);
-        if (ret)
-                return -1;
+        if (priv->bss_type == MWIFIEX_BSS_TYPE_STA) {
+                /* set ibss coalescing_status */
+                ret = mwifiex_send_cmd_async(
+                                priv, HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
+                                HostCmd_ACT_GEN_SET, 0, &enable);
+                if (ret)
+                        return -1;
+        }
 
         memset(&amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl));
         amsdu_aggr_ctrl.enable = true;
@@ -1293,7 +1313,8 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         if (ret)
                 return -1;
 
-        if (first_sta) {
+        if (first_sta && priv->adapter->iface_type != MWIFIEX_USB &&
+            priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
                 /* Enable auto deep sleep */
                 auto_ds.auto_ds = DEEP_SLEEP_ON;
                 auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME;
@@ -1305,12 +1326,16 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
                         return -1;
         }
 
-        /* Send cmd to FW to enable/disable 11D function */
-        state_11d = ENABLE_11D;
-        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SNMP_MIB,
-                                     HostCmd_ACT_GEN_SET, DOT11D_I, &state_11d);
-        if (ret)
-                dev_err(priv->adapter->dev, "11D: failed to enable 11D\n");
+        if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
+                /* Send cmd to FW to enable/disable 11D function */
+                state_11d = ENABLE_11D;
+                ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                                             HostCmd_ACT_GEN_SET, DOT11D_I,
+                                             &state_11d);
+                if (ret)
+                        dev_err(priv->adapter->dev,
+                                "11D: failed to enable 11D\n");
+        }
 
         /* Send cmd to FW to configure 11n specific configuration
          * (Short GI, Channel BW, Green field support etc.) for transmit