From: Eliad Peller <eliad@wizery.com>
To: Luciano Coelho <coelho@ti.com>
Cc: <linux-wireless@vger.kernel.org>
Subject: [PATCH 04/12] wl12xx: fw api change - add role_id to tsf_info
Date: Mon, 30 Jan 2012 14:00:49 +0200 [thread overview]
Message-ID: <1327924857-1250-5-git-send-email-eliad@wizery.com> (raw)
In-Reply-To: <1327924857-1250-1-git-send-email-eliad@wizery.com>
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: Eliad Peller <eliad@wizery.com>
---
drivers/net/wireless/wl12xx/acx.c | 7 +++++--
drivers/net/wireless/wl12xx/acx.h | 9 ++++++---
drivers/net/wireless/wl12xx/main.c | 3 ++-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c
index 7537c40..af2c312 100644
--- a/drivers/net/wireless/wl12xx/acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -1459,9 +1459,10 @@ out:
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) {
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h
index 69892b4..a5bf761 100644
--- a/drivers/net/wireless/wl12xx/acx.h
+++ b/drivers/net/wireless/wl12xx/acx.h
@@ -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);
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 51059a8..1c73c01 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -4019,6 +4019,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;
@@ -4033,7 +4034,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;
--
1.7.6.401.g6a319
next prev parent reply other threads:[~2012-01-30 11:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 12:00 [PATCH 00/12] wl12xx: update fw api Eliad Peller
2012-01-30 12:00 ` [PATCH 01/12] wl12xx: fw api change - add role_id to set_template Eliad Peller
2012-01-30 19:53 ` Luciano Coelho
2012-01-31 9:40 ` Eliad Peller
2012-01-30 12:00 ` [PATCH 02/12] wl12xx: use dev_role_id for scans Eliad Peller
2012-01-30 12:00 ` [PATCH 03/12] wl12xx: use dev_role_id for sched scan Eliad Peller
2012-01-30 19:47 ` Luciano Coelho
2012-01-30 12:00 ` Eliad Peller [this message]
2012-01-30 12:00 ` [PATCH 05/12] wl12xx: fw api change - update cmd/acx/event enums Eliad Peller
2012-01-30 12:00 ` [PATCH 06/12] wl12xx: Driver-FW API changes Eliad Peller
2012-01-30 19:48 ` Luciano Coelho
2012-01-30 12:00 ` [PATCH 07/12] wl12xx: remove PS management code Eliad Peller
2012-01-30 12:00 ` [PATCH 08/12] wl12xx: add support for HW dynamic PS Eliad Peller
2012-01-30 12:00 ` [PATCH 09/12] wl12xx: add dynamic_ps_timeout debugfs file Eliad Peller
2012-01-30 12:00 ` [PATCH 10/12] wl12xx: remove 2 unused parameters in wl1271_ps_set_mode() Eliad Peller
2012-01-30 12:00 ` [PATCH 11/12] wl12xx: enable/disable BET with AUTO_PS/ACTIVE Eliad Peller
2012-01-30 12:00 ` [PATCH 12/12] wl12xx: change WLVIF_FLAG_PSM name and remove WLVIF_FLAG_PSM_REQUESTED Eliad Peller
2012-01-30 13:29 ` [PATCH 00/12] wl12xx: update fw api Kalle Valo
2012-01-30 13:52 ` Eliad Peller
2012-01-30 13:55 ` Luciano Coelho
2012-01-30 19:59 ` Luciano Coelho
2012-01-31 7:50 ` Kalle Valo
2012-01-31 9:43 ` Eliad Peller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327924857-1250-5-git-send-email-eliad@wizery.com \
--to=eliad@wizery.com \
--cc=coelho@ti.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).