Commit f862a236 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwl3945: remove sequence number assignment 



Unlike agn, where the sequence numbers must
match with the TFD index, the driver for 3945
devices can use the sequence numbers provided
by mac80211 for QoS frames.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent c9696b2b

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

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ struct iwl_ht_agg { 




struct iwl_tid_data {

	u16 seq_number;

	u16 seq_number; /* agn only */

	u16 tfds_in_queue;

	struct iwl_ht_agg agg;

};

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −11
Original line number Diff line number Diff line
@@ -473,10 +473,8 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	u8 unicast;

	u8 sta_id;

	u8 tid = 0;

	u16 seq_number = 0;

	__le16 fc;

	u8 wait_write_ptr = 0;

	u8 *qc = NULL;

	unsigned long flags;



	spin_lock_irqsave(&priv->lock, flags);
@@ -519,16 +517,10 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	IWL_DEBUG_RATE(priv, "station Id %d\n", sta_id);



	if (ieee80211_is_data_qos(fc)) {

		qc = ieee80211_get_qos_ctl(hdr);

		u8 *qc = ieee80211_get_qos_ctl(hdr);

		tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;

		if (unlikely(tid >= MAX_TID_COUNT))

			goto drop;

		seq_number = priv->stations[sta_id].tid[tid].seq_number &

				IEEE80211_SCTL_SEQ;

		hdr->seq_ctrl = cpu_to_le16(seq_number) |

			(hdr->seq_ctrl &

				cpu_to_le16(IEEE80211_SCTL_FRAG));

		seq_number += 0x10;

	}



	/* Descriptor for chosen Tx queue */
@@ -587,8 +579,6 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 


	if (!ieee80211_has_morefrags(hdr->frame_control)) {

		txq->need_update = 1;

		if (qc)

			priv->stations[sta_id].tid[tid].seq_number = seq_number;

	} else {

		wait_write_ptr = 1;

		txq->need_update = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE