1 files changed, 25 insertions, 6 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 9ced5b778a77..4cdb4748b761 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1884,6 +1884,18 @@ static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
                 return -EAGAIN;
         }
 
+        if (priv->status & STATUS_ASSOCIATING) {
+                IPW_DEBUG_HC("abandon a command while associating\n");
+                spin_unlock_irqrestore(&priv->lock, flags);
+                return -1;
+        }
+
+        if (priv->status & STATUS_DISASSOCIATING) {
+                IPW_DEBUG_HC("abandon a command while disassociating\n");
+                spin_unlock_irqrestore(&priv->lock, flags);
+                return -1;
+        }
+
         priv->status |= STATUS_HCMD_ACTIVE;
 
         if (priv->cmdlog) {
@@ -3671,7 +3683,13 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
 {
         int err;
 
-        if (!(priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED))) {
+        if (priv->status & STATUS_ASSOCIATING) {
+                IPW_DEBUG_ASSOC("Disassociating while associating.\n");
+                queue_work(priv->workqueue, &priv->disassociate);
+                return;
+        }
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
                 IPW_DEBUG_ASSOC("Disassociating while not associated.\n");
                 return;
         }
@@ -3681,9 +3699,6 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                         MAC_ARG(priv->assoc_request.bssid),
                         priv->assoc_request.channel);
 
-        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
-        priv->status |= STATUS_DISASSOCIATING;
-
         if (quiet)
                 priv->assoc_request.assoc_type = HC_DISASSOC_QUIET;
         else
@@ -3695,6 +3710,9 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                 return;
         }
 
+        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
+        priv->status |= STATUS_DISASSOCIATING;
+
 }
 
 static int ipw_disassociate(void *data)
@@ -7625,8 +7643,6 @@ static int ipw_associate_network(struct ipw_priv *priv,
          */
         priv->channel = network->channel;
         memcpy(priv->bssid, network->bssid, ETH_ALEN);
-        priv->status |= STATUS_ASSOCIATING;
-        priv->status &= ~STATUS_SECURITY_UPDATED;
 
         priv->assoc_network = network;
 
@@ -7640,6 +7656,9 @@ static int ipw_associate_network(struct ipw_priv *priv,
                 return err;
         }
 
+        priv->status |= STATUS_ASSOCIATING;
+        priv->status &= ~STATUS_SECURITY_UPDATED;
+
         IPW_DEBUG(IPW_DL_STATE, "associating: '%s' " MAC_FMT " \n",
                   escape_essid(priv->essid, priv->essid_len),
                   MAC_ARG(priv->bssid));