diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-03-19 16:16:00 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-03 22:49:54 +0200 |
commit | 881acd8987f6633280247087219df465de784a69 (patch) | |
tree | ce3db162cafa616b531b2fed188096287618eec9 /drivers/net/wireless/iwlwifi/mvm/tx.c | |
parent | 20ecf9fd3bebc4147e2996c08a75d6f0229b90df (diff) | |
download | op-kernel-dev-881acd8987f6633280247087219df465de784a69.zip op-kernel-dev-881acd8987f6633280247087219df465de784a69.tar.gz |
iwlwifi: mvm: clean up invalid station handling
Using IWL_MVM_STATION_COUNT and IWL_INVALID_STATION together
isn't a good idea as they have different values. Always use
IWL_MVM_STATION_COUNT for an invalid station in MVM and move
the definition of the IWL_INVALID_STATION constant into the
DVM driver to avoid making such mistakes again. The one use
in the transport code can be hard-coded to -1 instead as the
station ID is passed as an integer there.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index c7456af..3fed01e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -365,7 +365,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb, if (WARN_ON_ONCE(!mvmsta)) return -1; - if (WARN_ON_ONCE(mvmsta->sta_id == IWL_INVALID_STATION)) + if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_STATION_COUNT)) return -1; dev_cmd = iwl_mvm_set_tx_params(mvm, skb, sta, mvmsta->sta_id); |