rt2x00: rt2800: don't overwrite SIFS values on erp changes
PATCH 2/3 rt2x00: rt2800: don't overwrite SIFS values on erp changes
The SIFS value is a constant and doesn't need to be updated on erp changes. Furthermore the code used 10us for both, the OFDM SIFS and CCK SIFS time which broke CTS protected 11g connections (see patch "rt2x00: rt2800: update initial SIFS values" for details).
--- drivers/net/wireless/rt2x00/rt2800lib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2800lib.c +0 -2
@@ -640,8 +640,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp)rt2800_register_write (rt2x00dev,BKOFF_SLOT_CFG , reg);rt2800_register_read (rt2x00dev,XIFS_TIME_CFG , ®); -rt2x00_set_field32 (®,XIFS_TIME_CFG_CCKM_SIFS_TIME , erp->sifs); -rt2x00_set_field32 (®,XIFS_TIME_CFG_OFDM_SIFS_TIME , erp->sifs);rt2x00_set_field32 (®,XIFS_TIME_CFG_EIFS , erp->eifs);rt2800_register_write (rt2x00dev,XIFS_TIME_CFG , reg);
Signature · 1 line
1.6.4.2
JFI, with this and the previous patch I can reliable transmit and receive data at 11b and 11g rates with only sporadic retries. Before that I had a huge amount of retries while transmitting with 11g rates (and enabled CTS protection).
Nevertheless I don't get good transfer speeds. I didn't measure exactly but just with scp. And I got ~600-700 KByte/s for TX and 400-500KByte/s for RX. This is still quite low.
Helmut
Am Donnerstag 06 Mai 2010 schrieb Helmut Schaa:
Quoted 24 lines
The SIFS value is a constant and doesn't need to be updated on erp changes. Furthermore the code used 10us for both, the OFDM SIFS and CCK SIFS time which broke CTS protected 11g connections (see patch "rt2x00: rt2800: update initial SIFS values" for details).
Signed-off-by Helmut Schaa <[email protected]>--- drivers/net/wireless/rt2x00/rt2800lib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)drivers/net/wireless/rt2x00/rt2800lib.c +0
-2@@ -640,8 +640,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp)rt2800_register_write (rt2x00dev,BKOFF_SLOT_CFG , reg);rt2800_register_read (rt2x00dev,XIFS_TIME_CFG , ®); -rt2x00_set_field32 (®,XIFS_TIME_CFG_CCKM_SIFS_TIME , erp->sifs); -rt2x00_set_field32 (®,XIFS_TIME_CFG_OFDM_SIFS_TIME , erp->sifs);rt2x00_set_field32 (®,XIFS_TIME_CFG_EIFS , erp->eifs);rt2800_register_write (rt2x00dev,XIFS_TIME_CFG , reg);
Am Donnerstag 06 Mai 2010 schrieb Helmut Schaa:
Quoted 3 lines
Nevertheless I don't get good transfer speeds. I didn't measure exactly but just with scp. And I got ~600-700 KByte/s for TX and 400-500KByte/s for RX. This is still quite low.
Nevermind, tested on a MIPS board. So maybe it's not the wireless but the CPU that's limiting scp performance.
When I find some time I'll try plain TCP connections.
Helmut
Quoted 6 lines · Helmut Schaa
The SIFS value is a constant and doesn't need to be updated on erp changes. Furthermore the code used 10us for both, the OFDM SIFS and CCK SIFS time which broke CTS protected 11g connections (see patch "rt2x00: rt2800: update initial SIFS values" for details).
Signed-off-by Helmut Schaa <[email protected]>
Quoted 17 lines
--- drivers/net/wireless/rt2x00/rt2800lib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)drivers/net/wireless/rt2x00/rt2800lib.c +0
-2@@ -640,8 +640,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp)rt2800_register_write (rt2x00dev,BKOFF_SLOT_CFG , reg);rt2800_register_read (rt2x00dev,XIFS_TIME_CFG , ®); -rt2x00_set_field32 (®,XIFS_TIME_CFG_CCKM_SIFS_TIME , erp->sifs); -rt2x00_set_field32 (®,XIFS_TIME_CFG_OFDM_SIFS_TIME , erp->sifs);rt2x00_set_field32 (®,XIFS_TIME_CFG_EIFS , erp->eifs);rt2800_register_write (rt2x00dev,XIFS_TIME_CFG , reg);
Quoted 6 lines · Helmut Schaa
The SIFS value is a constant and doesn't need to be updated on erp changes. Furthermore the code used 10us for both, the OFDM SIFS and CCK SIFS time which broke CTS protected 11g connections (see patch "rt2x00: rt2800: update initial SIFS values" for details).
Signed-off-by Helmut Schaa <[email protected]>
Quoted 21 lines
---
drivers/net/wireless/rt2x00/rt2800lib.c | 2 --1 files changed, 0 insertions(+), 2 deletions(-)drivers/net/wireless/rt2x00/rt2800lib.c +0
-3@@ -640,8 +640,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp) rt2800_register_write(rt2x00dev, BKOFF_SLOT_CFG, reg); rt2800_register_read(rt2x00dev, XIFS_TIME_CFG, ®); - rt2x00_set_field32(®, XIFS_TIME_CFG_CCKM_SIFS_TIME, erp->sifs); - rt2x00_set_field32(®, XIFS_TIME_CFG_OFDM_SIFS_TIME, erp->sifs); rt2x00_set_field32(®, XIFS_TIME_CFG_EIFS, erp->eifs); rt2800_register_write(rt2x00dev, XIFS_TIME_CFG, reg); --1.6.4.2