diff options
author | David S. Miller <davem@davemloft.net> | 2009-01-13 15:22:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-13 15:22:26 -0500 |
commit | 9a0811ca4e9cf7be320ae8a5a43a259feb70074f (patch) | |
tree | d8e0b2d1fcaa7e2da72d067fd7746b970bef457a /drivers/net/wireless/rt2x00/rt2x00queue.c | |
parent | 859975764fa61e927e7a69f46a55a4ba415785dd (diff) | |
parent | 26d1597c9a4532eec74f9651c4c96483cb8892fe (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index eaec6bd93ed5..746a8f36b931 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -313,7 +313,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, | |||
313 | * When preamble is enabled we should set the | 313 | * When preamble is enabled we should set the |
314 | * preamble bit for the signal. | 314 | * preamble bit for the signal. |
315 | */ | 315 | */ |
316 | if (rt2x00_get_rate_preamble(rate->hw_value)) | 316 | if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) |
317 | txdesc->signal |= 0x08; | 317 | txdesc->signal |= 0x08; |
318 | } | 318 | } |
319 | } | 319 | } |