Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl-hcmd.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index 6c537360820b280df3502994978336c978265785..6512834bb9162bf220a105ddfa1654cc540a577d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -93,6 +93,7 @@ const char *get_cmd_string(u8 cmd)
                IWL_CMD(CALIBRATION_CFG_CMD);
                IWL_CMD(CALIBRATION_RES_NOTIFICATION);
                IWL_CMD(CALIBRATION_COMPLETE_NOTIFICATION);
+               IWL_CMD(REPLY_TX_POWER_DBM_CMD);
        default:
                return "UNKNOWN";
 
@@ -227,7 +228,7 @@ cancel:
                 * TX cmd queue. Otherwise in case the cmd comes
                 * in later, it will possibly set an invalid
                 * address (cmd->meta.source). */
-               qcmd = &priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_idx];
+               qcmd = priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_idx];
                qcmd->meta.flags &= ~CMD_WANT_SKB;
        }
 fail: