Commit 7e0d15ee authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-net-next-2019-10-11' of... 

Merge tag 'mac80211-next-for-net-next-2019-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
A few more small things, nothing really stands out:
 * minstrel improvements from Felix
 * a TX aggregation simplification
 * some additional capabilities for hwsim
 * minor cleanups & docs updates
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cb0ce18a 7dfd8ac3

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

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw, 
	case IEEE80211_AMPDU_TX_START:

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

		if (!ret)

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

			ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;

		break;

	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

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

+1 −1
Original line number Diff line number Diff line
@@ -1921,7 +1921,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, 
		ath9k_ps_wakeup(sc);

		ret = ath_tx_aggr_start(sc, sta, tid, ssn);

		if (!ret)

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

			ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;

		ath9k_ps_restore(sc);

		break;

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

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

+1 −2
Original line number Diff line number Diff line
@@ -1449,8 +1449,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, 
		rcu_assign_pointer(sta_info->agg[tid], tid_info);

		spin_unlock_bh(&ar->tx_ampdu_list_lock);



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

		break;

		return IEEE80211_AMPDU_TX_START_IMMEDIATE;



	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

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

+3 −2
Original line number Diff line number Diff line
@@ -1084,6 +1084,7 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw, 
	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;

	int ret = 0;



	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac ampdu action action %d tid %d\n",

		    action, tid);
@@ -1106,7 +1107,7 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw, 
		sta_priv->ampdu_state[tid] = WCN36XX_AMPDU_START;

		spin_unlock_bh(&sta_priv->ampdu_lock);



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

		ret = IEEE80211_AMPDU_TX_START_IMMEDIATE;

		break;

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		spin_lock_bh(&sta_priv->ampdu_lock);
@@ -1131,7 +1132,7 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw, 


	mutex_unlock(&wcn->conf_mutex);



	return 0;

	return ret;

}



static const struct ieee80211_ops wcn36xx_ops = {

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

+1 −2
Original line number Diff line number Diff line
@@ -850,8 +850,7 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw, 
				     "START: tid %d is not agg\'able\n", tid);

			return -EINVAL;

		}

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

		break;

		return IEEE80211_AMPDU_TX_START_IMMEDIATE;



	case IEEE80211_AMPDU_TX_STOP_CONT:

	case IEEE80211_AMPDU_TX_STOP_FLUSH:

CRA Git | Maintained and supported by SUSTech CRA and CCSE