rt2x00: Don't initialize MM40 HT protection to RTS/CTS on PCI devices
Since HT protection is now configurable via mac80211 we don't need this special case for PCI devices anymore. The HT protection config will be overwritten as soon as mac80211 sends us a HT operation mode. Hence, bring the HT MM40 protection config in sync with the other HT protection registers and initialize it to no protection. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
87c1915d2c
Коммит
d13a97f07d
|
@ -2016,8 +2016,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
|
||||||
|
|
||||||
rt2800_register_read(rt2x00dev, MM40_PROT_CFG, ®);
|
rt2800_register_read(rt2x00dev, MM40_PROT_CFG, ®);
|
||||||
rt2x00_set_field32(®, MM40_PROT_CFG_PROTECT_RATE, 0x4084);
|
rt2x00_set_field32(®, MM40_PROT_CFG_PROTECT_RATE, 0x4084);
|
||||||
rt2x00_set_field32(®, MM40_PROT_CFG_PROTECT_CTRL,
|
rt2x00_set_field32(®, MM40_PROT_CFG_PROTECT_CTRL, 0);
|
||||||
!rt2x00_is_usb(rt2x00dev));
|
|
||||||
rt2x00_set_field32(®, MM40_PROT_CFG_PROTECT_NAV, 1);
|
rt2x00_set_field32(®, MM40_PROT_CFG_PROTECT_NAV, 1);
|
||||||
rt2x00_set_field32(®, MM40_PROT_CFG_TX_OP_ALLOW_CCK, 1);
|
rt2x00_set_field32(®, MM40_PROT_CFG_TX_OP_ALLOW_CCK, 1);
|
||||||
rt2x00_set_field32(®, MM40_PROT_CFG_TX_OP_ALLOW_OFDM, 1);
|
rt2x00_set_field32(®, MM40_PROT_CFG_TX_OP_ALLOW_OFDM, 1);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче