summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez2009-11-03 01:27:33 +0100
committerJohn W. Linville2009-11-11 23:09:02 +0100
commit5008f3727b05b5eb970ce703721aa5897a088e30 (patch)
treedc1b6375341339f0270a0f31a0e9b919c4ed7c29
parentath9k: use correct hw for tx aggregation TX completion (diff)
downloadkernel-qcow2-linux-5008f3727b05b5eb970ce703721aa5897a088e30.tar.gz
kernel-qcow2-linux-5008f3727b05b5eb970ce703721aa5897a088e30.tar.xz
kernel-qcow2-linux-5008f3727b05b5eb970ce703721aa5897a088e30.zip
ath9k: use the right hw on ath_tx_setup_buffer() for HT
When using virtual wiphys the base sc->hw was being used, the correct hw is passed along the caller already so just use that. Cc: Jouni.Malinen <Jouni.Malinen@atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 6d7f0bcc6dd7..fc06768e8231 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1576,7 +1576,7 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
bf->bf_frmlen = skb->len + FCS_LEN - (hdrlen & 3);
- if (conf_is_ht(&sc->hw->conf) && !is_pae(skb))
+ if (conf_is_ht(&hw->conf) && !is_pae(skb))
bf->bf_state.bf_type |= BUF_HT;
bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);