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

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

rt2x00: Add missing TSF sync mode for AP operation 



Currently rt2x00 uses the TSF_SYNC_BEACON mode for all beaconing
interface types. However, TSF_SYNC_BEACON is meant for IBSS networks and
thus implements TSF merging in the hardware. Rename TSF_SYNC_BEACON to
TSF_SYNC_ADHOC to better express its purpose and introduce the missing
TSF sync mode TSF_SYNC_AP_NONE which should be used for beaconing modes
that don't need TSF merging.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8544df32

drivers/net/wireless/rt2x00/rt2800lib.c

+3 −2
Original line number Diff line number Diff line
@@ -805,7 +805,8 @@ void rt2800_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf, 
		rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);

		rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_SYNC, conf->sync);

		rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE,

				   (conf->sync == TSF_SYNC_BEACON));

				   (conf->sync == TSF_SYNC_ADHOC ||

				    conf->sync == TSF_SYNC_AP_NONE));

		rt2800_register_write(rt2x00dev, BCN_TIME_CFG, reg);



		/*
@@ -813,7 +814,7 @@ void rt2800_config_intf(struct rt2x00_dev *rt2x00dev, struct rt2x00_intf *intf, 
		 */

		rt2800_register_read(rt2x00dev, INT_TIMER_EN, &reg);

		rt2x00_set_field32(&reg, INT_TIMER_EN_PRE_TBTT_TIMER,

				   (conf->sync == TSF_SYNC_BEACON));

				   (conf->sync == TSF_SYNC_AP_NONE));

		rt2800_register_write(rt2x00dev, INT_TIMER_EN, reg);



	}

drivers/net/wireless/rt2x00/rt2x00config.c

+3 −1
Original line number Diff line number Diff line
@@ -41,10 +41,12 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev, 


	switch (type) {

	case NL80211_IFTYPE_ADHOC:

		conf.sync = TSF_SYNC_ADHOC;

		break;

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_WDS:

		conf.sync = TSF_SYNC_BEACON;

		conf.sync = TSF_SYNC_AP_NONE;

		break;

	case NL80211_IFTYPE_STATION:

		conf.sync = TSF_SYNC_INFRA;

drivers/net/wireless/rt2x00/rt2x00reg.h

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ enum led_mode { 
enum tsf_sync {

	TSF_SYNC_NONE = 0,

	TSF_SYNC_INFRA = 1,

	TSF_SYNC_BEACON = 2,

	TSF_SYNC_ADHOC = 2,

	TSF_SYNC_AP_NONE = 3,

};



/*