diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:04:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:04:04 +0200 |
| commit | 8040d77688014987ca5738bf1731db72ab273441 (patch) | |
| tree | 99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /drivers/net/wireless/ath9k/xmit.c | |
| parent | fb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff) | |
| parent | 268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff) | |
Merge branch 'core/resources' into x86/core
Diffstat (limited to 'drivers/net/wireless/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 157f830ee6b..550129f717e 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. |