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

Commit fdf426a3 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: kill iwl_{start,stop}_tx_ba_trans_ready 



Since my latest patches, the upper layer reports to mac80211 that the
driver is ready to continue the start / stop BA flow as opposed to
the transport layer. Hence, iwl_{start,stop}_tx_ba_trans_ready are
not needed any more.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 631b84c5

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+11 −11
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta, u16 tid)

{

	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;

	struct iwl_tid_data *tid_data;

	unsigned long flags;

	int sta_id;
@@ -495,7 +494,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, 


	spin_unlock_irqrestore(&priv->shrd->lock, flags);



	iwl_stop_tx_ba_trans_ready(priv, vif_priv->ctx->ctxid, sta_id, tid);

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



	return 0;

}
@@ -503,7 +502,6 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, 
int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,

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

{

	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;

	struct iwl_tid_data *tid_data;

	unsigned long flags;

	int sta_id;
@@ -546,8 +544,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d",

				    tid_data->agg.ssn);

		tid_data->agg.state = IWL_AGG_ON;

		iwl_start_tx_ba_trans_ready(priv, vif_priv->ctx->ctxid, sta_id,

					    tid);

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

	} else {

		IWL_DEBUG_TX_QUEUES(priv, "Can't proceed: ssn %d, "

				    "next_reclaimed = %d",
@@ -625,9 +622,16 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif, 
static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)

{

	struct iwl_tid_data *tid_data = &priv->tid_data[sta_id][tid];

	enum iwl_rxon_context_id ctx;

	struct ieee80211_vif *vif;

	u8 *addr;



	lockdep_assert_held(&priv->shrd->sta_lock);



	addr = priv->stations[sta_id].sta.sta.addr;

	ctx = priv->stations[sta_id].ctxid;

	vif = priv->contexts[ctx].vif;



	switch (priv->tid_data[sta_id][tid].agg.state) {

	case IWL_EMPTYING_HW_QUEUE_DELBA:

		/* There are no packets for this RA / TID in the HW any more */
@@ -637,9 +641,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid) 
				" %d", tid_data->next_reclaimed);

			iwl_trans_tx_agg_disable(trans(priv), sta_id, tid);

			tid_data->agg.state = IWL_AGG_OFF;

			iwl_stop_tx_ba_trans_ready(priv,

						   NUM_IWL_RXON_CTX,

						   sta_id, tid);

			ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);

		}

		break;

	case IWL_EMPTYING_HW_QUEUE_ADDBA:
@@ -649,9 +651,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid) 
				"Can continue ADDBA flow ssn = next_recl ="

				" %d", tid_data->next_reclaimed);

			tid_data->agg.state = IWL_AGG_ON;

			iwl_start_tx_ba_trans_ready(priv,

						    NUM_IWL_RXON_CTX,

						    sta_id, tid);

			ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);

		}

		break;

	default:

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −28
Original line number Diff line number Diff line
@@ -1584,34 +1584,6 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, 
	return cpu_to_le32(res);

}



void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv,

				 enum iwl_rxon_context_id ctx,

				 u8 sta_id, u8 tid)

{

	struct ieee80211_vif *vif;

	u8 *addr = priv->stations[sta_id].sta.sta.addr;



	if (ctx == NUM_IWL_RXON_CTX)

		ctx = priv->stations[sta_id].ctxid;

	vif = priv->contexts[ctx].vif;



	ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);

}



void iwl_stop_tx_ba_trans_ready(struct iwl_priv *priv,

				enum iwl_rxon_context_id ctx,

				u8 sta_id, u8 tid)

{

	struct ieee80211_vif *vif;

	u8 *addr = priv->stations[sta_id].sta.sta.addr;



	if (ctx == NUM_IWL_RXON_CTX)

		ctx = priv->stations[sta_id].ctxid;

	vif = priv->contexts[ctx].vif;



	ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);

}



void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state)

{

	wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −6
Original line number Diff line number Diff line
@@ -532,12 +532,6 @@ int __must_check iwl_rx_dispatch(struct iwl_priv *priv, 
				 struct iwl_device_cmd *cmd);



int iwlagn_hw_valid_rtc_data_addr(u32 addr);

void iwl_start_tx_ba_trans_ready(struct iwl_priv *priv,

				 enum iwl_rxon_context_id ctx,

				 u8 sta_id, u8 tid);

void iwl_stop_tx_ba_trans_ready(struct iwl_priv *priv,

				enum iwl_rxon_context_id ctx,

				u8 sta_id, u8 tid);

void iwl_set_hw_rfkill_state(struct iwl_priv *priv, bool state);

void iwl_nic_config(struct iwl_priv *priv);

void iwl_free_skb(struct iwl_priv *priv, struct sk_buff *skb);