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

Commit 9a886586 authored by Johannes Berg's avatar Johannes Berg
Browse files

wireless: move sequence number arithmetic to ieee80211.h 



Move the sequence number arithmetic code from mac80211 to
ieee80211.h so others can use it. Also rename the functions
from _seq to _sn, they operate on the sequence number, not
the sequence_control field.

Also move macros to convert the sequence control to/from
the sequence number value from various drivers.

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

drivers/net/wireless/iwlegacy/3945.h

+0 −4
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ struct il3945_frame { 
	struct list_head list;

};



#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)

#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)

#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)



#define SUP_RATE_11A_MAX_NUM_CHANNELS  8

#define SUP_RATE_11B_MAX_NUM_CHANNELS  4

#define SUP_RATE_11G_MAX_NUM_CHANNELS  12

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

+7 −6
Original line number Diff line number Diff line
@@ -2258,7 +2258,7 @@ il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif, 


	spin_lock_irqsave(&il->sta_lock, flags);

	tid_data = &il->stations[sta_id].tid[tid];

	*ssn = SEQ_TO_SN(tid_data->seq_number);

	*ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.txq_id = txq_id;

	il_set_swq_id(&il->txq[txq_id], il4965_get_ac_from_tid(tid), txq_id);

	spin_unlock_irqrestore(&il->sta_lock, flags);
@@ -2408,7 +2408,7 @@ il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id) 
		/* aggregated HW queue */

		if (txq_id == tid_data->agg.txq_id &&

		    q->read_ptr == q->write_ptr) {

			u16 ssn = SEQ_TO_SN(tid_data->seq_number);

			u16 ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);

			int tx_fifo = il4965_get_fifo_from_tid(tid);

			D_HT("HW queue empty: continue DELBA flow\n");

			il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo);
@@ -2627,7 +2627,8 @@ il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr) 
static inline u32

il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp)

{

	return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN;

	return le32_to_cpup(&tx_resp->u.status +

			    tx_resp->frame_count) & IEEE80211_MAX_SN;

}



static inline u32
@@ -2717,15 +2718,15 @@ il4965_tx_status_reply_tx(struct il_priv *il, struct il_ht_agg *agg, 
			hdr = (struct ieee80211_hdr *) skb->data;



			sc = le16_to_cpu(hdr->seq_ctrl);

			if (idx != (SEQ_TO_SN(sc) & 0xff)) {

			if (idx != (IEEE80211_SEQ_TO_SN(sc) & 0xff)) {

				IL_ERR("BUG_ON idx doesn't match seq control"

				       " idx=%d, seq_idx=%d, seq=%d\n", idx,

				       SEQ_TO_SN(sc), hdr->seq_ctrl);

				       IEEE80211_SEQ_TO_SN(sc), hdr->seq_ctrl);

				return -1;

			}



			D_TX_REPLY("AGG Frame i=%d idx %d seq=%d\n", i, idx,

				   SEQ_TO_SN(sc));

				   IEEE80211_SEQ_TO_SN(sc));



			sh = idx - start;

			if (sh > 64) {

drivers/net/wireless/iwlegacy/common.h

+0 −4
Original line number Diff line number Diff line
@@ -541,10 +541,6 @@ struct il_frame { 
	struct list_head list;

};



#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)

#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)

#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)



enum {

	CMD_SYNC = 0,

	CMD_SIZE_NORMAL = 0,

drivers/net/wireless/iwlwifi/dvm/tx.c

+6 −5
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
				" Tx flags = 0x%08x, agg.state = %d",

				info->flags, tid_data->agg.state);

			IWL_ERR(priv, "sta_id = %d, tid = %d seq_num = %d",

				sta_id, tid, SEQ_TO_SN(tid_data->seq_number));

				sta_id, tid,

				IEEE80211_SEQ_TO_SN(tid_data->seq_number));

			goto drop_unlock_sta;

		}
@@ -569,7 +570,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		return 0;

	}



	tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);



	/* There are still packets for this RA / TID in the HW */

	if (!test_bit(txq_id, priv->agg_q_alloc)) {
@@ -651,7 +652,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, 


	spin_lock_bh(&priv->sta_lock);

	tid_data = &priv->tid_data[sta_id][tid];

	tid_data->agg.ssn = SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.txq_id = txq_id;



	*ssn = tid_data->agg.ssn;
@@ -911,7 +912,7 @@ static void iwlagn_count_agg_tx_err_status(struct iwl_priv *priv, u16 status) 
static inline u32 iwlagn_get_scd_ssn(struct iwlagn_tx_resp *tx_resp)

{

	return le32_to_cpup((__le32 *)&tx_resp->status +

			    tx_resp->frame_count) & MAX_SN;

			    tx_resp->frame_count) & IEEE80211_MAX_SN;

}



static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,
@@ -1148,7 +1149,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb, 


	if (tx_resp->frame_count == 1) {

		u16 next_reclaimed = le16_to_cpu(tx_resp->seq_ctl);

		next_reclaimed = SEQ_TO_SN(next_reclaimed + 0x10);

		next_reclaimed = IEEE80211_SEQ_TO_SN(next_reclaimed + 0x10);



		if (is_agg) {

			/* If this is an aggregation queue, we can rely on the

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

+0 −3
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ 
 * completely agnostic to these differences.

 * The transport does provide helper functionnality (i.e. SYNC / ASYNC mode),

 */

#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)

#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)

#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)

#define SEQ_TO_QUEUE(s)	(((s) >> 8) & 0x1f)

#define QUEUE_TO_SEQ(q)	(((q) & 0x1f) << 8)

#define SEQ_TO_INDEX(s)	((s) & 0xff)