aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rs.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c8
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 43edd8fd440..2f09e3b7f0e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -301,7 +301,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
301 if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { 301 if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {
302 IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n", 302 IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
303 sta->addr, tid); 303 sta->addr, tid);
304 ieee80211_start_tx_ba_session(priv->hw, sta->addr, tid); 304 ieee80211_start_tx_ba_session(sta, tid);
305 } 305 }
306} 306}
307 307
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 6385cdf24d1..b80cd0bc584 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2691,6 +2691,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
2691} 2691}
2692 2692
2693static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, 2693static int iwl_mac_ampdu_action(struct ieee80211_hw *hw,
2694 struct ieee80211_vif *vif,
2694 enum ieee80211_ampdu_mlme_action action, 2695 enum ieee80211_ampdu_mlme_action action,
2695 struct ieee80211_sta *sta, u16 tid, u16 *ssn) 2696 struct ieee80211_sta *sta, u16 tid, u16 *ssn)
2696{ 2697{
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index ebfc460115d..f3dff2ecc40 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -1312,7 +1312,7 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
1312 if (tid_data->tfds_in_queue == 0) { 1312 if (tid_data->tfds_in_queue == 0) {
1313 IWL_DEBUG_HT(priv, "HW queue is empty\n"); 1313 IWL_DEBUG_HT(priv, "HW queue is empty\n");
1314 tid_data->agg.state = IWL_AGG_ON; 1314 tid_data->agg.state = IWL_AGG_ON;
1315 ieee80211_start_tx_ba_cb_irqsafe(priv->hw, ra, tid); 1315 ieee80211_start_tx_ba_cb_irqsafe(priv->vif, ra, tid);
1316 } else { 1316 } else {
1317 IWL_DEBUG_HT(priv, "HW queue is NOT empty: %d packets in HW queue\n", 1317 IWL_DEBUG_HT(priv, "HW queue is NOT empty: %d packets in HW queue\n",
1318 tid_data->tfds_in_queue); 1318 tid_data->tfds_in_queue);
@@ -1377,7 +1377,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
1377 if (ret) 1377 if (ret)
1378 return ret; 1378 return ret;
1379 1379
1380 ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid); 1380 ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid);
1381 1381
1382 return 0; 1382 return 0;
1383} 1383}
@@ -1401,7 +1401,7 @@ int iwl_txq_check_empty(struct iwl_priv *priv, int sta_id, u8 tid, int txq_id)
1401 priv->cfg->ops->lib->txq_agg_disable(priv, txq_id, 1401 priv->cfg->ops->lib->txq_agg_disable(priv, txq_id,
1402 ssn, tx_fifo); 1402 ssn, tx_fifo);
1403 tid_data->agg.state = IWL_AGG_OFF; 1403 tid_data->agg.state = IWL_AGG_OFF;
1404 ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, addr, tid); 1404 ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, addr, tid);
1405 } 1405 }
1406 break; 1406 break;
1407 case IWL_EMPTYING_HW_QUEUE_ADDBA: 1407 case IWL_EMPTYING_HW_QUEUE_ADDBA:
@@ -1409,7 +1409,7 @@ int iwl_txq_check_empty(struct iwl_priv *priv, int sta_id, u8 tid, int txq_id)
1409 if (tid_data->tfds_in_queue == 0) { 1409 if (tid_data->tfds_in_queue == 0) {
1410 IWL_DEBUG_HT(priv, "HW queue empty: continue ADDBA flow\n"); 1410 IWL_DEBUG_HT(priv, "HW queue empty: continue ADDBA flow\n");
1411 tid_data->agg.state = IWL_AGG_ON; 1411 tid_data->agg.state = IWL_AGG_ON;
1412 ieee80211_start_tx_ba_cb_irqsafe(priv->hw, addr, tid); 1412 ieee80211_start_tx_ba_cb_irqsafe(priv->vif, addr, tid);
1413 } 1413 }
1414 break; 1414 break;
1415 } 1415 }