Skip to content

Commit

Permalink
wl1271: Add keep-alive frame template support
Browse files Browse the repository at this point in the history 
Add support for keep-alive templates, which are indexed.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Juuso Oikarinen authored and John W. Linville committed Mar 31, 2010
1 parent a9af092 commit bfb24c9
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 18 deletions.
35 changes: 29 additions & 6 deletions drivers/net/wireless/wl12xx/wl1271_cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
}

int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,
void *buf, size_t buf_len)
void *buf, size_t buf_len, int index)
{
struct wl1271_cmd_template_set *cmd;
int ret = 0;
Expand All @@ -719,6 +719,7 @@ int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,
cmd->enabled_rates = cpu_to_le32(wl->conf.tx.rc_conf.enabled_rates);
cmd->short_retry_limit = wl->conf.tx.rc_conf.short_retry_limit;
cmd->long_retry_limit = wl->conf.tx.rc_conf.long_retry_limit;
cmd->index = index;

if (buf)
memcpy(cmd->template_data, buf, buf_len);
Expand Down Expand Up @@ -755,7 +756,7 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl)
ptr = skb->data;
}

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, ptr, size);
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, ptr, size, 0);

out:
dev_kfree_skb(skb);
Expand All @@ -766,6 +767,28 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl)

}

int wl1271_cmd_build_klv_null_data(struct wl1271 *wl)
{
struct sk_buff *skb = NULL;
int ret = -ENOMEM;

skb = ieee80211_nullfunc_get(wl->hw, wl->vif);
if (!skb)
goto out;

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV,
skb->data, skb->len,
CMD_TEMPL_KLV_IDX_NULL_DATA);

out:
dev_kfree_skb(skb);
if (ret)
wl1271_warning("cmd build klv null data failed %d", ret);

return ret;

}

int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)
{
struct sk_buff *skb;
Expand All @@ -776,7 +799,7 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)
goto out;

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb->data,
skb->len);
skb->len, 0);

out:
dev_kfree_skb(skb);
Expand All @@ -801,10 +824,10 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl,

if (band == IEEE80211_BAND_2GHZ)
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,
skb->data, skb->len);
skb->data, skb->len, 0);
else
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_5,
skb->data, skb->len);
skb->data, skb->len, 0);

out:
dev_kfree_skb(skb);
Expand All @@ -829,7 +852,7 @@ int wl1271_build_qos_null_data(struct wl1271 *wl)
template.qos_ctrl = cpu_to_le16(0);

return wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, &template,
sizeof(template));
sizeof(template), 0);
}

int wl1271_cmd_set_default_wep_key(struct wl1271 *wl, u8 id)
Expand Down
8 changes: 7 additions & 1 deletion drivers/net/wireless/wl12xx/wl1271_cmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,14 @@ int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
const u8 *ie, size_t ie_len, u8 active_scan,
u8 high_prio, u8 band, u8 probe_requests);
int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,
void *buf, size_t buf_len);
void *buf, size_t buf_len, int index);
int wl1271_cmd_build_null_data(struct wl1271 *wl);
int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid);
int wl1271_cmd_build_probe_req(struct wl1271 *wl,
const u8 *ssid, size_t ssid_len,
const u8 *ie, size_t ie_len, u8 band);
int wl1271_build_qos_null_data(struct wl1271 *wl);
int wl1271_cmd_build_klv_null_data(struct wl1271 *wl);
int wl1271_cmd_set_default_wep_key(struct wl1271 *wl, u8 id);
int wl1271_cmd_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
u8 key_size, const u8 *key, const u8 *addr,
Expand Down Expand Up @@ -101,6 +102,11 @@ enum wl1271_commands {

#define MAX_CMD_PARAMS 572

enum {
CMD_TEMPL_KLV_IDX_NULL_DATA = 0,
CMD_TEMPL_KLV_IDX_MAX = 4
};

enum cmd_templ {
CMD_TEMPL_NULL_DATA = 0,
CMD_TEMPL_BEACON,
Expand Down
31 changes: 22 additions & 9 deletions drivers/net/wireless/wl12xx/wl1271_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,50 +51,63 @@ static int wl1271_init_hwenc_config(struct wl1271 *wl)

int wl1271_init_templates_config(struct wl1271 *wl)
{
int ret;
int ret, i;

/* send empty templates for fw memory reservation */
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4, NULL,
sizeof(struct wl12xx_probe_req_template));
sizeof(struct wl12xx_probe_req_template),
0);
if (ret < 0)
return ret;

if (wl1271_11a_enabled()) {
size_t size = sizeof(struct wl12xx_probe_req_template);
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_5,
NULL,
sizeof(struct wl12xx_probe_req_template));
NULL, size, 0);
if (ret < 0)
return ret;
}

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, NULL,
sizeof(struct wl12xx_null_data_template));
sizeof(struct wl12xx_null_data_template),
0);
if (ret < 0)
return ret;

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, NULL,
sizeof(struct wl12xx_ps_poll_template));
sizeof(struct wl12xx_ps_poll_template),
0);
if (ret < 0)
return ret;

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, NULL,
sizeof
(struct wl12xx_qos_null_data_template));
(struct wl12xx_qos_null_data_template),
0);
if (ret < 0)
return ret;

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PROBE_RESPONSE, NULL,
sizeof
(struct wl12xx_probe_resp_template));
(struct wl12xx_probe_resp_template),
0);
if (ret < 0)
return ret;

ret = wl1271_cmd_template_set(wl, CMD_TEMPL_BEACON, NULL,
sizeof
(struct wl12xx_beacon_template));
(struct wl12xx_beacon_template),
0);
if (ret < 0)
return ret;

for (i = 0; i < CMD_TEMPL_KLV_IDX_MAX; i++) {
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV, NULL,
WL1271_CMD_TEMPL_MAX_SIZE, i);
if (ret < 0)
return ret;
}

return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/wl12xx/wl1271_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
wl1271_ssid_set(wl, beacon);
ret = wl1271_cmd_template_set(wl, CMD_TEMPL_BEACON,
beacon->data,
beacon->len);
beacon->len, 0);

if (ret < 0) {
dev_kfree_skb(beacon);
Expand All @@ -1611,7 +1611,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
ret = wl1271_cmd_template_set(wl,
CMD_TEMPL_PROBE_RESPONSE,
beacon->data,
beacon->len);
beacon->len, 0);
dev_kfree_skb(beacon);
if (ret < 0)
goto out_sleep;
Expand Down

0 comments on commit bfb24c9

Please sign in to comment.