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

Commit 21513402 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mac80211: pass block ack session timeout to to driver"

parents 4f1f60e0 6af69d2d

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

+4 −3
Original line number Diff line number Diff line
@@ -1657,13 +1657,14 @@ static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw, 


static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  enum ieee80211_ampdu_mlme_action action,

				  struct ieee80211_sta *sta,

				  u16 tid, u16 *ssn, u8 buf_size, bool amsdu)

				  struct ieee80211_ampdu_params *params)

{

	struct ath9k_htc_priv *priv = hw->priv;

	struct ath9k_htc_sta *ista;

	int ret = 0;

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;



	mutex_lock(&priv->mutex);

	ath9k_htc_ps_wakeup(priv);

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

+5 −3
Original line number Diff line number Diff line
@@ -1860,14 +1860,16 @@ static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 


static int ath9k_ampdu_action(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif,

			      enum ieee80211_ampdu_mlme_action action,

			      struct ieee80211_sta *sta,

			      u16 tid, u16 *ssn, u8 buf_size, bool amsdu)

			      struct ieee80211_ampdu_params *params)

{

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	bool flush = false;

	int ret = 0;

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;



	mutex_lock(&sc->mutex);

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

+5 −3
Original line number Diff line number Diff line
@@ -1413,10 +1413,12 @@ static void carl9170_ampdu_work(struct work_struct *work) 


static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,

				    struct ieee80211_vif *vif,

				    enum ieee80211_ampdu_mlme_action action,

				    struct ieee80211_sta *sta,

				    u16 tid, u16 *ssn, u8 buf_size, bool amsdu)

				    struct ieee80211_ampdu_params *params)

{

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;

	struct ar9170 *ar = hw->priv;

	struct carl9170_sta_info *sta_info = (void *) sta->drv_priv;

	struct carl9170_sta_tid *tid_info;

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

+5 −3
Original line number Diff line number Diff line
@@ -857,12 +857,14 @@ static int wcn36xx_resume(struct ieee80211_hw *hw) 


static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    enum ieee80211_ampdu_mlme_action action,

		    struct ieee80211_sta *sta, u16 tid, u16 *ssn,

		    u8 buf_size, bool amsdu)

		    struct ieee80211_ampdu_params *params)

{

	struct wcn36xx *wcn = hw->priv;

	struct wcn36xx_sta *sta_priv = NULL;

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;



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

		    action, tid);

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

+5 −3
Original line number Diff line number Diff line
@@ -818,13 +818,15 @@ brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
static int

brcms_ops_ampdu_action(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    enum ieee80211_ampdu_mlme_action action,

		    struct ieee80211_sta *sta, u16 tid, u16 *ssn,

		    u8 buf_size, bool amsdu)

		    struct ieee80211_ampdu_params *params)

{

	struct brcms_info *wl = hw->priv;

	struct scb *scb = &wl->wlc->pri_scb;

	int status;

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;

	u8 buf_size = params->buf_size;



	if (WARN_ON(scb->magic != SCB_MAGIC))

		return -EIDRM;