summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJouni Malinen2008-08-11 13:01:51 +0200
committerJohn W. Linville2008-09-03 21:32:44 +0200
commit9aab3e3ee6f256a1eaabc275e0748132966f963d (patch)
treeec59ca6f13e05682a04c37d5ff1ffd161cb22c7c /drivers/net
parentath9k: Fix TX status reporting (diff)
downloadkernel-qcow2-linux-9aab3e3ee6f256a1eaabc275e0748132966f963d.tar.gz
kernel-qcow2-linux-9aab3e3ee6f256a1eaabc275e0748132966f963d.tar.xz
kernel-qcow2-linux-9aab3e3ee6f256a1eaabc275e0748132966f963d.zip
ath9k: Fix TX control flag use for no ACK and RTS/CTS
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath9k/xmit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 157f830ee6b8..550129f717e2 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -357,9 +357,9 @@ static int ath_tx_prepare(struct ath_softc *sc,
txctl->flags = ATH9K_TXDESC_CLRDMASK; /* needed for crypto errors */
if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
- tx_info->flags |= ATH9K_TXDESC_NOACK;
+ txctl->flags |= ATH9K_TXDESC_NOACK;
if (tx_info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
- tx_info->flags |= ATH9K_TXDESC_RTSENA;
+ txctl->flags |= ATH9K_TXDESC_RTSENA;
/*
* Setup for rate calculations.