iwlwifi: Fix synchronous host command

This patch replaces static variable from send_cmd_sync
with flag in priv->status. It was used for reentrance protection
but clearly made it impossible to stuck more cards into the same machine

In addition it force check of return values of synchronous commands
commands that doesn't requires return value async commands have to be used

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Yi Zhu <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 18 insertions, 17 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index d7ccf13b875d..ac1226946aa6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -401,23 +401,24 @@ struct iwl3945_rx_queue {
 #define MIN_B_CHANNELS  1
 
 #define STATUS_HCMD_ACTIVE      0       /* host command in progress */
-#define STATUS_INT_ENABLED      1
-#define STATUS_RF_KILL_HW       2
-#define STATUS_RF_KILL_SW       3
-#define STATUS_INIT             4
-#define STATUS_ALIVE            5
-#define STATUS_READY            6
-#define STATUS_TEMPERATURE      7
-#define STATUS_GEO_CONFIGURED   8
-#define STATUS_EXIT_PENDING     9
-#define STATUS_IN_SUSPEND       10
-#define STATUS_STATISTICS       11
-#define STATUS_SCANNING         12
-#define STATUS_SCAN_ABORTING    13
-#define STATUS_SCAN_HW          14
-#define STATUS_POWER_PMI        15
-#define STATUS_FW_ERROR         16
-#define STATUS_CONF_PENDING     17
+#define STATUS_HCMD_SYNC_ACTIVE 1       /* sync host command in progress */
+#define STATUS_INT_ENABLED      2
+#define STATUS_RF_KILL_HW       3
+#define STATUS_RF_KILL_SW       4
+#define STATUS_INIT             5
+#define STATUS_ALIVE            6
+#define STATUS_READY            7
+#define STATUS_TEMPERATURE      8
+#define STATUS_GEO_CONFIGURED   9
+#define STATUS_EXIT_PENDING     10
+#define STATUS_IN_SUSPEND       11
+#define STATUS_STATISTICS       12
+#define STATUS_SCANNING         13
+#define STATUS_SCAN_ABORTING    14
+#define STATUS_SCAN_HW          15
+#define STATUS_POWER_PMI        16
+#define STATUS_FW_ERROR         17
+#define STATUS_CONF_PENDING     18
 
 #define MAX_TID_COUNT        9