Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 809bfe81 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

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).

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a21c2ab4

drivers/net/wireless/rt2x00/rt2800lib.c

+0 −2
Original line number Diff line number Diff line
@@ -639,8 +639,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, &reg);

	rt2x00_set_field32(&reg, XIFS_TIME_CFG_CCKM_SIFS_TIME, erp->sifs);

	rt2x00_set_field32(&reg, XIFS_TIME_CFG_OFDM_SIFS_TIME, erp->sifs);

	rt2x00_set_field32(&reg, XIFS_TIME_CFG_EIFS, erp->eifs);

	rt2800_register_write(rt2x00dev, XIFS_TIME_CFG, reg);