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

Commit 0df3ef45 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

mac80211: A-MPDU Tx add session's and low level driver's API 



This patch adds the API for 3 stages in A-MPDU Tx session flow:
- request mac80211 to start/stop A-MPDU Tx session for specific TID. such a
  request should be issued by a load aware element, either mac80211 itself
  or external element.
- requests by mac80211 to low-level driver to start/stop Tx aggregation.
  notice that low level driver responds now with Starting Sequence Number.
- async feedback by low-level to mac80211 to inform that HW is ready for
  next A-MPDU Tx state.
Changes in API to Rx A-MPDU were also made, reflected in iwlwifi changes as
well.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8816edce

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

+2 −2
Original line number Diff line number Diff line
@@ -4732,7 +4732,7 @@ static void iwl4965_sta_modify_del_ba_tid(struct iwl4965_priv *priv, 


int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

			     enum ieee80211_ampdu_mlme_action action,

			     const u8 *addr, u16 tid, u16 ssn)

			     const u8 *addr, u16 tid, u16 *ssn)

{

	struct iwl4965_priv *priv = hw->priv;

	int sta_id;
@@ -4744,7 +4744,7 @@ int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, 
	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		IWL_DEBUG_HT("start Rx\n");

		iwl4965_sta_modify_add_ba_tid(priv, sta_id, tid, ssn);

		iwl4965_sta_modify_add_ba_tid(priv, sta_id, tid, *ssn);

		break;

	case IEEE80211_AMPDU_RX_STOP:

		IWL_DEBUG_HT("stop Rx\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ extern void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index, 
				struct ieee80211_ht_info *sta_ht_inf);

extern int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

				    enum ieee80211_ampdu_mlme_action action,

				    const u8 *addr, u16 tid, u16 ssn);

				    const u8 *addr, u16 tid, u16 *ssn);

#ifdef CONFIG_IWL4965_HT_AGG

extern int iwl4965_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da,

				   u16 tid, u16 *start_seq_num);

include/net/mac80211.h

+84 −2
Original line number Diff line number Diff line
@@ -967,10 +967,14 @@ enum ieee80211_filter_flags { 
 * &struct ieee80211_ops to indicate which action is needed.

 * @IEEE80211_AMPDU_RX_START: start Rx aggregation

 * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation

 * @IEEE80211_AMPDU_TX_START: start Tx aggregation

 * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation

 */

enum ieee80211_ampdu_mlme_action {

	IEEE80211_AMPDU_RX_START,

	IEEE80211_AMPDU_RX_STOP,

	IEEE80211_AMPDU_TX_START,

	IEEE80211_AMPDU_TX_STOP,

};



/**
@@ -1111,7 +1115,8 @@ enum ieee80211_ampdu_mlme_action { 
 * 	The RA/TID combination determines the destination and TID we want

 * 	the ampdu action to be performed for. The action is defined through

 * 	ieee80211_ampdu_mlme_action. Starting sequence number (@ssn)

 * 	is the first frame we expect to perform the action on.

 * 	is the first frame we expect to perform the action on. notice

 * 	that TX/RX_STOP can pass NULL for this parameter.

 */

struct ieee80211_ops {

	int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
@@ -1162,7 +1167,7 @@ struct ieee80211_ops { 
	int (*conf_ht)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);

	int (*ampdu_action)(struct ieee80211_hw *hw,

			    enum ieee80211_ampdu_mlme_action action,

			    const u8 *ra, u16 tid, u16 ssn);

			    const u8 *addr, u16 tid, u16 *ssn);

};



/**
@@ -1574,4 +1579,81 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw, 
						struct ieee80211_vif *vif),

					 void *data);



/**

 * ieee80211_start_tx_ba_session - Start a tx Block Ack session.

 * @hw: pointer as obtained from ieee80211_alloc_hw().

 * @ra: receiver address of the BA session recipient

 * @tid: the TID to BA on.

 * @return: success if addBA request was sent, failure otherwise

 *

 * Although mac80211/low level driver/user space application can estimate

 * the need to start aggregation on a certain RA/TID, the session level

 * will be managed by the mac80211.

 */

int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid);



/**

 * ieee80211_start_tx_ba_cb - low level driver ready to aggregate.

 * @hw: pointer as obtained from ieee80211_alloc_hw().

 * @ra: receiver address of the BA session recipient.

 * @tid: the TID to BA on.

 *

 * This function must be called by low level driver once it has

 * finished with preparations for the BA session.

 */

void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid);



/**

 * ieee80211_start_tx_ba_cb_irqsafe - low level driver ready to aggregate.

 * @hw: pointer as obtained from ieee80211_alloc_hw().

 * @ra: receiver address of the BA session recipient.

 * @tid: the TID to BA on.

 *

 * This function must be called by low level driver once it has

 * finished with preparations for the BA session.

 * This version of the function is irq safe.

 */

void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,

				      u16 tid);



/**

 * ieee80211_stop_tx_ba_session - Stop a Block Ack session.

 * @hw: pointer as obtained from ieee80211_alloc_hw().

 * @ra: receiver address of the BA session recipient

 * @tid: the TID to stop BA.

 * @initiator: if indicates initiator DELBA frame will be sent.

 * @return: error if no sta with matching da found, success otherwise

 *

 * Although mac80211/low level driver/user space application can estimate

 * the need to stop aggregation on a certain RA/TID, the session level

 * will be managed by the mac80211.

 */

int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw,

				 u8 *ra, u16 tid,

				 enum ieee80211_back_parties initiator);



/**

 * ieee80211_stop_tx_ba_cb - low level driver ready to stop aggregate.

 * @hw: pointer as obtained from ieee80211_alloc_hw().

 * @ra: receiver address of the BA session recipient.

 * @tid: the desired TID to BA on.

 *

 * This function must be called by low level driver once it has

 * finished with preparations for the BA session tear down.

 */

void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid);



/**

 * ieee80211_stop_tx_ba_cb_irqsafe - low level driver ready to stop aggregate.

 * @hw: pointer as obtained from ieee80211_alloc_hw().

 * @ra: receiver address of the BA session recipient.

 * @tid: the desired TID to BA on.

 *

 * This function must be called by low level driver once it has

 * finished with preparations for the BA session tear down.

 * This version of the function is irq safe.

 */

void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,

				     u16 tid);



#endif /* MAC80211_H */

net/mac80211/ieee80211_sta.c

+2 −2
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, 


	if (local->ops->ampdu_action)

		ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_START,

					       sta->addr, tid, start_seq_num);

					       sta->addr, tid, &start_seq_num);

#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Rx A-MPDU on tid %d result %d", tid, ret);

#endif /* CONFIG_MAC80211_HT_DEBUG */
@@ -1230,7 +1230,7 @@ void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *ra, u16 tid, 
	BUG_ON(!local->ops->ampdu_action);



	ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_STOP,

					ra, tid, EINVAL);

					ra, tid, NULL);

	if (ret)

		printk(KERN_DEBUG "HW problem - can not stop rx "

				"aggergation for tid %d\n", tid);