1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index 7353826095f1..d6aab00272b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -35,9 +35,12 @@
 #include "iwl-trans.h"
 
 /* priv->shrd->sta_lock must be held */
-static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
+static int iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
 {
-
+        if (sta_id >= IWLAGN_STATION_COUNT) {
+                IWL_ERR(priv, "invalid sta_id %u", sta_id);
+                return -EINVAL;
+        }
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE))
                 IWL_ERR(priv, "ACTIVATE a non DRIVER active station id %u "
                         "addr %pM\n",
@@ -53,6 +56,7 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
                 IWL_DEBUG_ASSOC(priv, "Added STA id %u addr %pM to uCode\n",
                                 sta_id, priv->stations[sta_id].sta.sta.addr);
         }
+        return 0;
 }
 
 static int iwl_process_add_sta_resp(struct iwl_priv *priv,
@@ -77,8 +81,7 @@ static int iwl_process_add_sta_resp(struct iwl_priv *priv,
         switch (pkt->u.add_sta.status) {
         case ADD_STA_SUCCESS_MSK:
                 IWL_DEBUG_INFO(priv, "REPLY_ADD_STA PASSED\n");
-                iwl_sta_ucode_activate(priv, sta_id);
-                ret = 0;
+                ret = iwl_sta_ucode_activate(priv, sta_id);
                 break;
         case ADD_STA_NO_ROOM_IN_TABLE:
                 IWL_ERR(priv, "Adding station %d failed, no room in table.\n",