linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ivo van Doorn <ivdoorn@gmail.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, rt2400-devel@lists.sourceforge.net
Subject: [PATCH 3/9] rt2x00: Don't enable short preamble for 1MBs
Date: Mon, 21 Apr 2008 19:00:17 +0200	[thread overview]
Message-ID: <200804211900.17323.IvDoorn@gmail.com> (raw)
In-Reply-To: <200804211858.46659.IvDoorn@gmail.com>

The timing settings for 1MBs should exclude
the short preamble bit since that only applies
to 2MBs, 5.5MBs and 11MBs.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2400pci.c |    2 +-
 drivers/net/wireless/rt2x00/rt2500pci.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index b41187a..18e599e 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -363,7 +363,7 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev,
 	rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
 
 	rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
-	rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00 | preamble_mask);
+	rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00);
 	rt2x00_set_field32(&reg, ARCSR2_SERVICE, 0x04);
 	rt2x00_set_field32(&reg, ARCSR2_LENGTH, get_duration(ACK_SIZE, 10));
 	rt2x00pci_register_write(rt2x00dev, ARCSR2, reg);
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 5ade097..c54ea5a 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -370,7 +370,7 @@ static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev,
 	rt2x00pci_register_write(rt2x00dev, TXCSR1, reg);
 
 	rt2x00pci_register_read(rt2x00dev, ARCSR2, &reg);
-	rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00 | preamble_mask);
+	rt2x00_set_field32(&reg, ARCSR2_SIGNAL, 0x00);
 	rt2x00_set_field32(&reg, ARCSR2_SERVICE, 0x04);
 	rt2x00_set_field32(&reg, ARCSR2_LENGTH, get_duration(ACK_SIZE, 10));
 	rt2x00pci_register_write(rt2x00dev, ARCSR2, reg);
-- 
1.5.4.5


  parent reply	other threads:[~2008-04-21 17:00 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <200804211858.46659.IvDoorn@gmail.com>
2008-04-21 16:59 ` [PATCH 1/9] rt2x00: Support hardware RTS and CTS-to-self frames Ivo van Doorn
2008-04-21 16:59 ` [PATCH 2/9] rt2x00: Remove DRIVER_SUPPORT_MIXED_INTERFACES Ivo van Doorn
2008-04-21 17:00 ` Ivo van Doorn [this message]
2008-04-21 17:00 ` [PATCH 4/9] rt2x00: Use rt2x00 queue numbering Ivo van Doorn
2008-04-21 17:17   ` Johannes Berg
2008-04-21 17:30     ` Ivo van Doorn
2008-04-21 17:58       ` Ivo van Doorn
2008-04-21 17:56         ` Johannes Berg
2008-04-21 21:40           ` Ivo van Doorn
2008-04-21 17:01 ` [PATCH 5/9] rt2x00: Fix quality/activity led handling Ivo van Doorn
2008-04-21 17:01 ` [PATCH 6/9] rt2x00: Clarify supported chipsets in Kconfig Ivo van Doorn
2008-04-21 17:01 ` [PATCH 7/9] rt2x00: Add helper macros Ivo van Doorn
2008-04-21 17:02 ` [PATCH 8/9] rt2x00: Fix kernel-doc Ivo van Doorn
2008-04-21 17:02 ` [PATCH 9/9] rt2x00: Release rt2x00 2.1.5 Ivo van Doorn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200804211900.17323.IvDoorn@gmail.com \
    --to=ivdoorn@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=rt2400-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).