Commit 9c531149 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: fw api change - add role_id to tsf_info 



The ACX_TSF_INFO command now takes role_id as param.
change the struct accordingly, and pass the wlvif
to the wl1271_acx_tsf_info() function.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent c059beb2

drivers/net/wireless/wl12xx/acx.c

+5 −2
Original line number Diff line number Diff line
@@ -1459,9 +1459,10 @@ int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, 
	return ret;

}



int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime)

int wl12xx_acx_tsf_info(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			u64 *mactime)

{

	struct wl1271_acx_fw_tsf_information *tsf_info;

	struct wl12xx_acx_fw_tsf_information *tsf_info;

	int ret;



	tsf_info = kzalloc(sizeof(*tsf_info), GFP_KERNEL);
@@ -1470,6 +1471,8 @@ int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime) 
		goto out;

	}



	tsf_info->role_id = wlvif->role_id;



	ret = wl1271_cmd_interrogate(wl, ACX_TSF_INFO,

				     tsf_info, sizeof(*tsf_info));

	if (ret < 0) {

drivers/net/wireless/wl12xx/acx.h

+6 −3
Original line number Diff line number Diff line
@@ -995,15 +995,17 @@ struct wl1271_acx_ba_receiver_setup { 
	u8 padding[2];

} __packed;



struct wl1271_acx_fw_tsf_information {

struct wl12xx_acx_fw_tsf_information {

	struct acx_header header;



	u8 role_id;

	u8 padding1[3];

	__le32 current_tsf_high;

	__le32 current_tsf_low;

	__le32 last_bttt_high;

	__le32 last_tbtt_low;

	u8 last_dtim_count;

	u8 padding[3];

	u8 padding2[3];

} __packed;



struct wl1271_acx_ps_rx_streaming {
@@ -1296,7 +1298,8 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl, 
				       struct wl12xx_vif *wlvif);

int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,

				       u16 ssn, bool enable, u8 peer_hlid);

int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime);

int wl12xx_acx_tsf_info(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			u64 *mactime);

int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			       bool enable);

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif);

drivers/net/wireless/wl12xx/main.c

+2 −1
Original line number Diff line number Diff line
@@ -4047,6 +4047,7 @@ static u64 wl1271_op_get_tsf(struct ieee80211_hw *hw, 
{



	struct wl1271 *wl = hw->priv;

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	u64 mactime = ULLONG_MAX;

	int ret;
@@ -4061,7 +4062,7 @@ static u64 wl1271_op_get_tsf(struct ieee80211_hw *hw, 
	if (ret < 0)

		goto out;



	ret = wl1271_acx_tsf_info(wl, &mactime);

	ret = wl12xx_acx_tsf_info(wl, wlvif, &mactime);

	if (ret < 0)

		goto out_sleep;