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

Commit 7294ec95 authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

iwlwifi: use le16 frame control directly, use QOS symbolic constant mask 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ba5b6efe

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

+2 −2
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 


	spin_unlock_irqrestore(&priv->lock, flags);



	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(fc));

	hdr_len = ieee80211_hdrlen(fc);



	/* Find (or create) index into station table for destination station */

	sta_id = iwl_get_sta_id(priv, hdr);
@@ -842,7 +842,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	txq_id = swq_id;

	if (ieee80211_is_data_qos(fc)) {

		qc = ieee80211_get_qos_ctl(hdr);

		tid = qc[0] & 0xf;

		tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;

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

		seq_number &= IEEE80211_SCTL_SEQ;

		hdr->seq_ctrl = hdr->seq_ctrl &

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

+3 −3
Original line number Diff line number Diff line
@@ -2574,7 +2574,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) 


	spin_unlock_irqrestore(&priv->lock, flags);



	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(fc));

	hdr_len = ieee80211_hdrlen(fc);



	/* Find (or create) index into station table for destination station */

	sta_id = iwl3945_get_sta_id(priv, hdr);
@@ -2590,7 +2590,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) 


	if (ieee80211_is_data_qos(fc)) {

		qc = ieee80211_get_qos_ctl(hdr);

		tid = qc[0] & 0xf;

		tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;

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

				IEEE80211_SCTL_SEQ;

		hdr->seq_ctrl = cpu_to_le16(seq_number) |
@@ -2709,7 +2709,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) 
			   sizeof(out_cmd->cmd.tx));



	iwl3945_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr,

			   ieee80211_get_hdrlen(le16_to_cpu(fc)));

			   ieee80211_hdrlen(fc));



	/* Tell device the write index *just past* this latest filled TFD */

	q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);