085737e0b0
SVN-Revision: 19501
20 lines
658 B
Diff
20 lines
658 B
Diff
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
|
@@ -1610,7 +1610,7 @@ static int ath_tx_setup_buffer(struct ie
|
|
bf->bf_frmlen -= padsize;
|
|
}
|
|
|
|
- if (conf_is_ht(&hw->conf) && !is_pae(skb))
|
|
+ if (conf_is_ht(&hw->conf))
|
|
bf->bf_state.bf_type |= BUF_HT;
|
|
|
|
bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);
|
|
@@ -1696,7 +1696,7 @@ static void ath_tx_start_dma(struct ath_
|
|
goto tx_done;
|
|
}
|
|
|
|
- if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
|
|
+ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {
|
|
/*
|
|
* Try aggregation if it's a unicast data frame
|
|
* and the destination is HT capable.
|