diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-04-30 14:30:46 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 18:09:06 -0400 |
commit | 619753ff57a2e15b58546b856536928d1a3daef9 (patch) | |
tree | 74a1b5ecc40adc80e8620da8e040c6733da812fa /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 2a87c26bbe9587baeb9e56d3ce0b4971bd777643 (diff) |
iwlagn: use iwl_sta_id() for aggregation
With the station ID being stored in the
station struct, which mac80211 gives us
for aggregation callbacks, we can also
remove the use of iwl_find_station() in
those code paths.
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-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8a4b83073540..3265b637db2e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3154,17 +3154,17 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, | |||
3154 | switch (action) { | 3154 | switch (action) { |
3155 | case IEEE80211_AMPDU_RX_START: | 3155 | case IEEE80211_AMPDU_RX_START: |
3156 | IWL_DEBUG_HT(priv, "start Rx\n"); | 3156 | IWL_DEBUG_HT(priv, "start Rx\n"); |
3157 | return iwl_sta_rx_agg_start(priv, sta->addr, tid, *ssn); | 3157 | return iwl_sta_rx_agg_start(priv, sta, tid, *ssn); |
3158 | case IEEE80211_AMPDU_RX_STOP: | 3158 | case IEEE80211_AMPDU_RX_STOP: |
3159 | IWL_DEBUG_HT(priv, "stop Rx\n"); | 3159 | IWL_DEBUG_HT(priv, "stop Rx\n"); |
3160 | ret = iwl_sta_rx_agg_stop(priv, sta->addr, tid); | 3160 | ret = iwl_sta_rx_agg_stop(priv, sta, tid); |
3161 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 3161 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
3162 | return 0; | 3162 | return 0; |
3163 | else | 3163 | else |
3164 | return ret; | 3164 | return ret; |
3165 | case IEEE80211_AMPDU_TX_START: | 3165 | case IEEE80211_AMPDU_TX_START: |
3166 | IWL_DEBUG_HT(priv, "start Tx\n"); | 3166 | IWL_DEBUG_HT(priv, "start Tx\n"); |
3167 | ret = iwlagn_tx_agg_start(priv, vif, sta->addr, tid, ssn); | 3167 | ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn); |
3168 | if (ret == 0) { | 3168 | if (ret == 0) { |
3169 | priv->_agn.agg_tids_count++; | 3169 | priv->_agn.agg_tids_count++; |
3170 | IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n", | 3170 | IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n", |
@@ -3173,7 +3173,7 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, | |||
3173 | return ret; | 3173 | return ret; |
3174 | case IEEE80211_AMPDU_TX_STOP: | 3174 | case IEEE80211_AMPDU_TX_STOP: |
3175 | IWL_DEBUG_HT(priv, "stop Tx\n"); | 3175 | IWL_DEBUG_HT(priv, "stop Tx\n"); |
3176 | ret = iwlagn_tx_agg_stop(priv, vif, sta->addr, tid); | 3176 | ret = iwlagn_tx_agg_stop(priv, vif, sta, tid); |
3177 | if ((ret == 0) && (priv->_agn.agg_tids_count > 0)) { | 3177 | if ((ret == 0) && (priv->_agn.agg_tids_count > 0)) { |
3178 | priv->_agn.agg_tids_count--; | 3178 | priv->_agn.agg_tids_count--; |
3179 | IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n", | 3179 | IWL_DEBUG_HT(priv, "priv->_agn.agg_tids_count = %u\n", |