Commit c3e334d2 authored by David Gnedt's avatar David Gnedt Committed by John W. Linville
Browse files

wl1251: enable beacon early termination while in power-saving mode 



Port the beacon early termination feature from wl1251 driver version
included in the Maemo Fremantle kernel.
It is enabled when going to power-saving mode and disabled when leaving
power-saving mode.

Signed-off-by: default avatarDavid Gnedt <david.gnedt@davizone.at>
Acked-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bb4793b3

drivers/net/wireless/wl1251/acx.c

+28 −0
Original line number Diff line number Diff line
@@ -978,6 +978,34 @@ int wl1251_acx_wr_tbtt_and_dtim(struct wl1251 *wl, u16 tbtt, u8 dtim) 
	return ret;

}



int wl1251_acx_bet_enable(struct wl1251 *wl, enum wl1251_acx_bet_mode mode,

			  u8 max_consecutive)

{

	struct wl1251_acx_bet_enable *acx;

	int ret;



	wl1251_debug(DEBUG_ACX, "acx bet enable");



	acx = kzalloc(sizeof(*acx), GFP_KERNEL);

	if (!acx) {

		ret = -ENOMEM;

		goto out;

	}



	acx->enable = mode;

	acx->max_consecutive = max_consecutive;



	ret = wl1251_cmd_configure(wl, ACX_BET_ENABLE, acx, sizeof(*acx));

	if (ret < 0) {

		wl1251_warning("wl1251 acx bet enable failed: %d", ret);

		goto out;

	}



out:

	kfree(acx);

	return ret;

}



int wl1251_acx_ac_cfg(struct wl1251 *wl, u8 ac, u8 cw_min, u16 cw_max,

		      u8 aifs, u16 txop)

{

drivers/net/wireless/wl1251/acx.h

+27 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,31 @@ struct wl1251_acx_wr_tbtt_and_dtim { 
	u8  padding;

} __packed;



enum wl1251_acx_bet_mode {

	WL1251_ACX_BET_DISABLE = 0,

	WL1251_ACX_BET_ENABLE = 1,

};



struct wl1251_acx_bet_enable {

	struct acx_header header;



	/*

	 * Specifies if beacon early termination procedure is enabled or

	 * disabled, see enum wl1251_acx_bet_mode.

	 */

	u8 enable;



	/*

	 * Specifies the maximum number of consecutive beacons that may be

	 * early terminated. After this number is reached at least one full

	 * beacon must be correctly received in FW before beacon ET

	 * resumes. Range 0 - 255.

	 */

	u8 max_consecutive;



	u8 padding[2];

} __packed;



struct wl1251_acx_ac_cfg {

	struct acx_header header;
@@ -1401,6 +1426,8 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime); 
int wl1251_acx_rate_policies(struct wl1251 *wl);

int wl1251_acx_mem_cfg(struct wl1251 *wl);

int wl1251_acx_wr_tbtt_and_dtim(struct wl1251 *wl, u16 tbtt, u8 dtim);

int wl1251_acx_bet_enable(struct wl1251 *wl, enum wl1251_acx_bet_mode mode,

			  u8 max_consecutive);

int wl1251_acx_ac_cfg(struct wl1251 *wl, u8 ac, u8 cw_min, u16 cw_max,

		      u8 aifs, u16 txop);

int wl1251_acx_tid_cfg(struct wl1251 *wl, u8 queue,

drivers/net/wireless/wl1251/ps.c

+11 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode) 
		if (ret < 0)

			return ret;



		ret = wl1251_acx_bet_enable(wl, WL1251_ACX_BET_ENABLE,

					    WL1251_DEFAULT_BET_CONSECUTIVE);

		if (ret < 0)

			return ret;



		ret = wl1251_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE);

		if (ret < 0)

			return ret;
@@ -170,6 +175,12 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode) 
		if (ret < 0)

			return ret;



		/* disable BET */

		ret = wl1251_acx_bet_enable(wl, WL1251_ACX_BET_DISABLE,

					    WL1251_DEFAULT_BET_CONSECUTIVE);

		if (ret < 0)

			return ret;



		/* disable beacon filtering */

		ret = wl1251_acx_beacon_filter_opt(wl, false);

		if (ret < 0)

drivers/net/wireless/wl1251/wl1251.h

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ void wl1251_disable_interrupts(struct wl1251 *wl); 


#define WL1251_DEFAULT_CHANNEL 0



#define WL1251_DEFAULT_BET_CONSECUTIVE 10



#define CHIP_ID_1251_PG10	           (0x7010101)

#define CHIP_ID_1251_PG11	           (0x7020101)

#define CHIP_ID_1251_PG12	           (0x7030101)