diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-03-30 05:46:29 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-09 14:28:03 -0400 |
commit | 76c3c698bf47927fb31044fa2f4321c99ed7411d (patch) | |
tree | 6d1906ee11ab47000160ecc306f85a5d4a016d1a /drivers/net/wireless/iwlwifi/iwl-sta.c | |
parent | a90178fa1dce52816ae9fa4a3ba031886b79c5ae (diff) |
iwlwifi: remove pointless sta_id invalid check
lq->sta_id cannot be invalid here since this
function will only be called after the station
has been added properly.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index a43493f2abcf..6876f7c59368 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -1187,13 +1187,9 @@ int iwl_send_lq_cmd(struct iwl_priv *priv, | |||
1187 | .data = lq, | 1187 | .data = lq, |
1188 | }; | 1188 | }; |
1189 | 1189 | ||
1190 | if ((lq->sta_id == 0xFF) && | 1190 | if (WARN_ON(lq->sta_id == IWL_INVALID_STATION)) |
1191 | (priv->iw_mode == NL80211_IFTYPE_ADHOC)) | ||
1192 | return -EINVAL; | 1191 | return -EINVAL; |
1193 | 1192 | ||
1194 | if (lq->sta_id == 0xFF) | ||
1195 | lq->sta_id = IWL_AP_ID; | ||
1196 | |||
1197 | iwl_dump_lq_cmd(priv, lq); | 1193 | iwl_dump_lq_cmd(priv, lq); |
1198 | BUG_ON(init && (cmd.flags & CMD_ASYNC)); | 1194 | BUG_ON(init && (cmd.flags & CMD_ASYNC)); |
1199 | 1195 | ||