1 files changed, 30 insertions, 23 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index 258d059ef41f..76f996623140 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -51,9 +51,7 @@ const char *get_cmd_string(u8 cmd)
                 IWL_CMD(REPLY_REMOVE_ALL_STA);
                 IWL_CMD(REPLY_TXFIFO_FLUSH);
                 IWL_CMD(REPLY_WEPKEY);
-                IWL_CMD(REPLY_3945_RX);
                 IWL_CMD(REPLY_TX);
-                IWL_CMD(REPLY_RATE_SCALE);
                 IWL_CMD(REPLY_LEDS_CMD);
                 IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);
                 IWL_CMD(COEX_PRIORITY_TABLE_CMD);
@@ -97,12 +95,23 @@ const char *get_cmd_string(u8 cmd)
                 IWL_CMD(REPLY_TX_POWER_DBM_CMD);
                 IWL_CMD(TEMPERATURE_NOTIFICATION);
                 IWL_CMD(TX_ANT_CONFIGURATION_CMD);
+                IWL_CMD(REPLY_BT_COEX_PROFILE_NOTIF);
+                IWL_CMD(REPLY_BT_COEX_PRIO_TABLE);
+                IWL_CMD(REPLY_BT_COEX_PROT_ENV);
+                IWL_CMD(REPLY_WIPAN_PARAMS);
+                IWL_CMD(REPLY_WIPAN_RXON);
+                IWL_CMD(REPLY_WIPAN_RXON_TIMING);
+                IWL_CMD(REPLY_WIPAN_RXON_ASSOC);
+                IWL_CMD(REPLY_WIPAN_QOS_PARAM);
+                IWL_CMD(REPLY_WIPAN_WEPKEY);
+                IWL_CMD(REPLY_WIPAN_P2P_CHANNEL_SWITCH);
+                IWL_CMD(REPLY_WIPAN_NOA_NOTIFICATION);
+                IWL_CMD(REPLY_WIPAN_DEACTIVATION_COMPLETE);
         default:
                 return "UNKNOWN";
 
         }
 }
-EXPORT_SYMBOL(get_cmd_string);
 
 #define HOST_COMPLETE_TIMEOUT (HZ / 2)
 
@@ -134,10 +143,12 @@ static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 {
         int ret;
 
-        BUG_ON(!(cmd->flags & CMD_ASYNC));
+        if (WARN_ON(!(cmd->flags & CMD_ASYNC)))
+                return -EINVAL;
 
         /* An asynchronous command can not expect an SKB to be set. */
-        BUG_ON(cmd->flags & CMD_WANT_SKB);
+        if (WARN_ON(cmd->flags & CMD_WANT_SKB))
+                return -EINVAL;
 
         /* Assign a generic callback if one is not provided */
         if (!cmd->callback)
@@ -160,14 +171,15 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
         int cmd_idx;
         int ret;
 
-        BUG_ON(cmd->flags & CMD_ASYNC);
+        if (WARN_ON(cmd->flags & CMD_ASYNC))
+                return -EINVAL;
 
          /* A synchronous command can not have a callback set. */
-        BUG_ON(cmd->callback);
+        if (WARN_ON(cmd->callback))
+                return -EINVAL;
 
         IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",
                         get_cmd_string(cmd->id));
-        mutex_lock(&priv->sync_cmd_mutex);
 
         set_bit(STATUS_HCMD_ACTIVE, &priv->status);
         IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",
@@ -176,9 +188,10 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
         cmd_idx = iwl_enqueue_hcmd(priv, cmd);
         if (cmd_idx < 0) {
                 ret = cmd_idx;
+                clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
                 IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
                           get_cmd_string(cmd->id), ret);
-                goto out;
+                return ret;
         }
 
         ret = wait_event_interruptible_timeout(priv->wait_command_queue,
@@ -218,8 +231,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                 goto cancel;
         }
 
-        ret = 0;
-        goto out;
+        return 0;
 
 cancel:
         if (cmd->flags & CMD_WANT_SKB) {
@@ -229,7 +241,7 @@ cancel:
                  * in later, it will possibly set an invalid
                  * address (cmd->meta.source).
                  */
-                priv->txq[IWL_CMD_QUEUE_NUM].meta[cmd_idx].flags &=
+                priv->txq[priv->cmd_queue].meta[cmd_idx].flags &=
                                                         ~CMD_WANT_SKB;
         }
 fail:
@@ -237,11 +249,9 @@ fail:
                 iwl_free_pages(priv, cmd->reply_page);
                 cmd->reply_page = 0;
         }
-out:
-        mutex_unlock(&priv->sync_cmd_mutex);
+
         return ret;
 }
-EXPORT_SYMBOL(iwl_send_cmd_sync);
 
 int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 {
@@ -250,19 +260,17 @@ int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 
         return iwl_send_cmd_sync(priv, cmd);
 }
-EXPORT_SYMBOL(iwl_send_cmd);
 
 int iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, const void *data)
 {
         struct iwl_host_cmd cmd = {
                 .id = id,
-                .len = len,
-                .data = data,
+                .len = { len, },
+                .data = { data, },
         };
 
         return iwl_send_cmd_sync(priv, &cmd);
 }
-EXPORT_SYMBOL(iwl_send_cmd_pdu);
 
 int iwl_send_cmd_pdu_async(struct iwl_priv *priv,
                            u8 id, u16 len, const void *data,
@@ -272,8 +280,8 @@ int iwl_send_cmd_pdu_async(struct iwl_priv *priv,
 {
         struct iwl_host_cmd cmd = {
                 .id = id,
-                .len = len,
-                .data = data,
+                .len = { len, },
+                .data = { data, },
         };
 
         cmd.flags |= CMD_ASYNC;
@@ -281,4 +289,3 @@ int iwl_send_cmd_pdu_async(struct iwl_priv *priv,
 
         return iwl_send_cmd_async(priv, &cmd);
 }
-EXPORT_SYMBOL(iwl_send_cmd_pdu_async);