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

Commit 07bc5457 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

ar9170: small misc changes 



This patch aggregates a bunch of small random changes
that won't fit really anywhere else properly.

1. move tid-locating macro into a separate function.

2. remove redundant NULL check.

3. add modulation mask definition

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15b098bb

drivers/net/wireless/ath/ar9170/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ struct ar9170_tx_control { 
#define AR9170_TX_MAC_RATE_PROBE		0x8000



/* either-or */

#define AR9170_TX_PHY_MOD_MASK			0x00000003

#define AR9170_TX_PHY_MOD_CCK			0x00000000

#define AR9170_TX_PHY_MOD_OFDM			0x00000001

#define AR9170_TX_PHY_MOD_HT			0x00000002

drivers/net/wireless/ath/ar9170/main.c

+7 −5
Original line number Diff line number Diff line
@@ -194,12 +194,15 @@ static inline u16 ar9170_get_seq(struct sk_buff *skb) 
	return ar9170_get_seq_h((void *) txc->frame_data);

}



static inline u16 ar9170_get_tid_h(struct ieee80211_hdr *hdr)

{

	return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;

}



static inline u16 ar9170_get_tid(struct sk_buff *skb)

{

	struct ar9170_tx_control *txc = (void *) skb->data;

	struct ieee80211_hdr *hdr = (void *) txc->frame_data;



	return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;

	return ar9170_get_tid_h((struct ieee80211_hdr *) txc->frame_data);

}



#define GET_NEXT_SEQ(seq)	((seq + 1) & 0x0fff)
@@ -1660,7 +1663,6 @@ static bool ar9170_tx_ampdu(struct ar9170 *ar) 
		 * tell the FW/HW that this is the last frame,

		 * that way it will wait for the immediate block ack.

		 */

		if (likely(skb_peek_tail(&agg)))

		ar9170_tx_indicate_immba(ar, skb_peek_tail(&agg));



#ifdef AR9170_TXAGG_DEBUG