From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ew0-f20.google.com ([209.85.219.20]:51391 "EHLO mail-ew0-f20.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751582AbZARTP3 (ORCPT ); Sun, 18 Jan 2009 14:15:29 -0500 Received: by ewy13 with SMTP id 13so38186ewy.13 for ; Sun, 18 Jan 2009 11:15:27 -0800 (PST) From: Ivo van Doorn To: linville@tuxdriver.com Subject: [PATCH] Fix TX rate short preamble detection Date: Sun, 18 Jan 2009 20:15:24 +0100 Cc: linux-wireless@vger.kernel.org, Chris Clayton MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Message-Id: <200901182015.24298.IvDoorn@gmail.com> (sfid-20090118_201533_653739_71C6A8D6) Sender: linux-wireless-owner@vger.kernel.org List-ID: Mac80211 provides 2 structures to handle bitrates, namely ieee80211_rate and ieee80211_tx_rate. To determine the short preamble mode for an outgoing frame, the flag IEEE80211_TX_RC_USE_SHORT_PREAMBLE must be checked on ieee80211_tx_rate and not ieee80211_rate (which rt2x00 did). This fixes a regression which was triggered in 2.6.29-rcX as reported by Chris Clayton. Signed-off-by: Ivo van Doorn --- diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index c1e5a05..3dab9b4 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -186,10 +186,11 @@ static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry, static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry, struct txentry_desc *txdesc, - struct ieee80211_rate *rate) + const struct rt2x00_rate *hwrate) { struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; - const struct rt2x00_rate *hwrate = rt2x00_get_rate(rate->hw_value); + struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb); + struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0]; unsigned int data_length; unsigned int duration; unsigned int residual; @@ -232,7 +233,7 @@ static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry, * When preamble is enabled we should set the * preamble bit for the signal. */ - if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) + if (txrate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) txdesc->signal |= 0x08; } } @@ -326,7 +327,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, */ rt2x00crypto_create_tx_descriptor(entry, txdesc); rt2x00queue_create_tx_descriptor_seq(entry, txdesc); - rt2x00queue_create_tx_descriptor_plcp(entry, txdesc, rate); + rt2x00queue_create_tx_descriptor_plcp(entry, txdesc, hwrate); } static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry,