Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18b559d5 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: split TX aggregation stop action 



When TX aggregation is stopped, there are a few
different cases:
 - connection with the peer was dropped
 - session stop was requested locally
 - session stop was requested by the peer
 - connection was dropped while a session is stopping

The behaviour in these cases should be different, if
the connection is dropped then the driver should drop
all frames, otherwise the frames may continue to be
transmitted, aggregated in the case of a locally
requested session stop or unaggregated in the case of
the peer requesting session stop.

Split these different cases so that the driver can
act accordingly; however, treat local and remote stop
the same way and ask the driver to not send frames as
aggregated packets any more.

In the case of connection drop, the stop callback the
driver is otherwise supposed to call is no longer
required.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 30bf5f1f

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+3 −1
Original line number Diff line number Diff line
@@ -1628,7 +1628,9 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw, 
		if (!ret)

			ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

	case IEEE80211_AMPDU_TX_STOP:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		ath9k_htc_tx_aggr_oper(priv, vif, sta, action, tid);

		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;

drivers/net/wireless/ath/ath9k/main.c

+3 −1
Original line number Diff line number Diff line
@@ -1610,7 +1610,9 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, 
			ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		ath9k_ps_restore(sc);

		break;

	case IEEE80211_AMPDU_TX_STOP:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		ath9k_ps_wakeup(sc);

		ath_tx_aggr_stop(sc, sta, tid);

		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

drivers/net/wireless/ath/carl9170/main.c

+3 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,9 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, 
		ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;



	case IEEE80211_AMPDU_TX_STOP:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		rcu_read_lock();

		tid_info = rcu_dereference(sta_info->agg[tid]);

		if (tid_info) {

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+3 −1
Original line number Diff line number Diff line
@@ -668,7 +668,9 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw, 
		ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);

		break;



	case IEEE80211_AMPDU_TX_STOP:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		spin_lock_bh(&wl->lock);

		brcms_c_ampdu_flush(wl->wlc, sta, tid);

		spin_unlock_bh(&wl->lock);

drivers/net/wireless/iwlegacy/4965-mac.c

+3 −1
Original line number Diff line number Diff line
@@ -5968,7 +5968,9 @@ il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		D_HT("start Tx\n");

		ret = il4965_tx_agg_start(il, vif, sta, tid, ssn);

		break;

	case IEEE80211_AMPDU_TX_STOP:

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

	case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:

		D_HT("stop Tx\n");

		ret = il4965_tx_agg_stop(il, vif, sta, tid);

		if (test_bit(S_EXIT_PENDING, &il->status))