diff options
| author | Johannes Berg | 2010-03-30 11:46:29 +0200 |
|---|---|---|
| committer | Reinette Chatre | 2010-04-09 20:28:03 +0200 |
| commit | 76c3c698bf47927fb31044fa2f4321c99ed7411d (patch) | |
| tree | 6d1906ee11ab47000160ecc306f85a5d4a016d1a | |
| parent | iwlagn: simplify WEP key check (diff) | |
| download | kernel-qcow2-linux-76c3c698bf47927fb31044fa2f4321c99ed7411d.tar.gz kernel-qcow2-linux-76c3c698bf47927fb31044fa2f4321c99ed7411d.tar.xz kernel-qcow2-linux-76c3c698bf47927fb31044fa2f4321c99ed7411d.zip | |
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>
| -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, .data = lq, }; - if ((lq->sta_id == 0xFF) && - (priv->iw_mode == NL80211_IFTYPE_ADHOC)) + if (WARN_ON(lq->sta_id == IWL_INVALID_STATION)) return -EINVAL; - if (lq->sta_id == 0xFF) - lq->sta_id = IWL_AP_ID; - iwl_dump_lq_cmd(priv, lq); BUG_ON(init && (cmd.flags & CMD_ASYNC)); |