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

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
...@@ -276,6 +276,7 @@ struct ar9170_tx_control { ...@@ -276,6 +276,7 @@ struct ar9170_tx_control {
#define AR9170_TX_MAC_RATE_PROBE 0x8000 #define AR9170_TX_MAC_RATE_PROBE 0x8000
/* either-or */ /* either-or */
#define AR9170_TX_PHY_MOD_MASK 0x00000003
#define AR9170_TX_PHY_MOD_CCK 0x00000000 #define AR9170_TX_PHY_MOD_CCK 0x00000000
#define AR9170_TX_PHY_MOD_OFDM 0x00000001 #define AR9170_TX_PHY_MOD_OFDM 0x00000001
#define AR9170_TX_PHY_MOD_HT 0x00000002 #define AR9170_TX_PHY_MOD_HT 0x00000002
......
...@@ -194,12 +194,15 @@ static inline u16 ar9170_get_seq(struct sk_buff *skb) ...@@ -194,12 +194,15 @@ static inline u16 ar9170_get_seq(struct sk_buff *skb)
return ar9170_get_seq_h((void *) txc->frame_data); 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) static inline u16 ar9170_get_tid(struct sk_buff *skb)
{ {
struct ar9170_tx_control *txc = (void *) skb->data; struct ar9170_tx_control *txc = (void *) skb->data;
struct ieee80211_hdr *hdr = (void *) txc->frame_data; return ar9170_get_tid_h((struct ieee80211_hdr *) txc->frame_data);
return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;
} }
#define GET_NEXT_SEQ(seq) ((seq + 1) & 0x0fff) #define GET_NEXT_SEQ(seq) ((seq + 1) & 0x0fff)
...@@ -1660,8 +1663,7 @@ static bool ar9170_tx_ampdu(struct ar9170 *ar) ...@@ -1660,8 +1663,7 @@ static bool ar9170_tx_ampdu(struct ar9170 *ar)
* tell the FW/HW that this is the last frame, * tell the FW/HW that this is the last frame,
* that way it will wait for the immediate block ack. * 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));
ar9170_tx_indicate_immba(ar, skb_peek_tail(&agg));
#ifdef AR9170_TXAGG_DEBUG #ifdef AR9170_TXAGG_DEBUG
printk(KERN_DEBUG "%s: generated A-MPDU looks like this:\n", printk(KERN_DEBUG "%s: generated A-MPDU looks like this:\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment