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

Commit 44a9809b authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Don't enable short preamble for 1MBs 



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

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 22182283

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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);