1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index f7b920d7a95a..f7d204ffd6e9 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -1897,6 +1897,10 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
         case HostCmd_CMD_TDLS_OPER:
                 ret = mwifiex_cmd_tdls_oper(priv, cmd_ptr, data_buf);
                 break;
+        case HostCmd_CMD_CHAN_REPORT_REQUEST:
+                ret = mwifiex_cmd_issue_chan_report_request(priv, cmd_ptr,
+                                                            data_buf);
+                break;
         default:
                 dev_err(priv->adapter->dev,
                         "PREP_CMD: unknown cmd- %#x\n", cmd_no);
@@ -1911,6 +1915,8 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
  *
  * This is called after firmware download to bring the card to
  * working state.
+ * Function is also called during reinitialization of virtual
+ * interfaces.
  *
  * The following commands are issued sequentially -
  *      - Set PCI-Express host buffer configuration (PCIE only)
@@ -1925,7 +1931,7 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
  *      - Set 11d control
  *      - Set MAC control (this must be the last command to initialize firmware)
  */
-int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
+int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
 {
         struct mwifiex_adapter *adapter = priv->adapter;
         int ret;
@@ -2059,9 +2065,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
                                 "11D: failed to enable 11D\n");
         }
 
-        /* set last_init_cmd before sending the command */
-        priv->adapter->last_init_cmd = HostCmd_CMD_11N_CFG;
-
         /* Send cmd to FW to configure 11n specific configuration
          * (Short GI, Channel BW, Green field support etc.) for transmit
          */
@@ -2069,7 +2072,11 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         ret = mwifiex_send_cmd(priv, HostCmd_CMD_11N_CFG,
                                HostCmd_ACT_GEN_SET, 0, &tx_cfg, true);
 
-        ret = -EINPROGRESS;
+        if (init) {
+                /* set last_init_cmd before sending the command */
+                priv->adapter->last_init_cmd = HostCmd_CMD_11N_CFG;
+                ret = -EINPROGRESS;
+        }
 
         return ret;
 }