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

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

rt2x00: Add support for CTS protection in rt2x00lib 



Inform drivers about the changed CTS protection settings.

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

drivers/net/wireless/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ struct rt2x00lib_conf { 
 */

struct rt2x00lib_erp {

	int short_preamble;

	int cts_protection;



	int ack_timeout;

	int ack_consume_time;

drivers/net/wireless/rt2x00/rt2x00config.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev, 
	memset(&erp, 0, sizeof(erp));



	erp.short_preamble = bss_conf->use_short_preamble;

	erp.cts_protection = bss_conf->use_cts_prot;



	erp.ack_timeout = PLCP + get_duration(ACK_SIZE, 10);

	erp.ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10);

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
	 * When the erp information has changed, we should perform

	 * additional configuration steps. For all other changes we are done.

	 */

	if (changes & BSS_CHANGED_ERP_PREAMBLE) {

	if (changes & (BSS_CHANGED_ERP_PREAMBLE | BSS_CHANGED_ERP_CTS_PROT)) {

		if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))

			rt2x00lib_config_erp(rt2x00dev, intf, bss_conf);

		else