openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mwifiex: parse adhoc start/join result 

Even if ADHOC start or join attempt is failed, these commands
are returned with success status by firmware. Actual connection
result is provided inside command response.

This patch parses the adhoc connection result and resets
connection state variables if connection is not successful.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Amitkumar Karwar 2015-12-04 06:13:02 -08:00 committed by Kalle Valo
parent bd9a212bab
commit d5556e8761
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/marvell/mwifiex/fw.h
View File

@ -1092,9 +1092,15 @@ struct host_cmd_ds_802_11_ad_hoc_start {
u8 data_rate[HOSTCMD_SUPPORTED_RATES];
} __packed;
struct host_cmd_ds_802_11_ad_hoc_result {
struct host_cmd_ds_802_11_ad_hoc_start_result {
u8 pad[3];
u8 bssid[ETH_ALEN];
u8 pad2[2];
u8 result;
} __packed;
struct host_cmd_ds_802_11_ad_hoc_join_result {
u8 result;
} __packed;
struct adhoc_bss_desc {
@ -2124,7 +2130,8 @@ struct host_cmd_ds_command {
struct host_cmd_ds_802_11_associate_rsp associate_rsp;
struct host_cmd_ds_802_11_deauthenticate deauth;
struct host_cmd_ds_802_11_ad_hoc_start adhoc_start;
struct host_cmd_ds_802_11_ad_hoc_result adhoc_result;
struct host_cmd_ds_802_11_ad_hoc_start_result start_result;
struct host_cmd_ds_802_11_ad_hoc_join_result join_result;
struct host_cmd_ds_802_11_ad_hoc_join adhoc_join;
struct host_cmd_ds_802_11d_domain_info domain_info;
struct host_cmd_ds_802_11d_domain_info_rsp domain_info_resp;

20
drivers/net/wireless/marvell/mwifiex/join.c
View File

@ -1247,20 +1247,26 @@ int mwifiex_ret_802_11_ad_hoc(struct mwifiex_private *priv,
{
int ret = 0;
struct mwifiex_adapter *adapter = priv->adapter;
struct host_cmd_ds_802_11_ad_hoc_result *adhoc_result;
struct host_cmd_ds_802_11_ad_hoc_start_result *start_result =
&resp->params.start_result;
struct host_cmd_ds_802_11_ad_hoc_join_result *join_result =
&resp->params.join_result;
struct mwifiex_bssdescriptor *bss_desc;
u16 reason_code;
u16 cmd = le16_to_cpu(resp->command);
u8 result;
adhoc_result = &resp->params.adhoc_result;
if (cmd == HostCmd_CMD_802_11_AD_HOC_START)
result = start_result->result;
else
result = join_result->result;
bss_desc = priv->attempted_bss_desc;
/* Join result code 0 --> SUCCESS */
reason_code = le16_to_cpu(resp->result);
if (reason_code) {
if (result) {
mwifiex_dbg(priv->adapter, ERROR, "ADHOC_RESP: failed\n");
if (priv->media_connected)
mwifiex_reset_connect_state(priv, reason_code);
mwifiex_reset_connect_state(priv, result);
memset(&priv->curr_bss_params.bss_descriptor,
0x00, sizeof(struct mwifiex_bssdescriptor));
@ -1278,7 +1284,7 @@ int mwifiex_ret_802_11_ad_hoc(struct mwifiex_private *priv,
/* Update the created network descriptor with the new BSSID */
memcpy(bss_desc->mac_address,
adhoc_result->bssid, ETH_ALEN);
start_result->bssid, ETH_ALEN);
priv->adhoc_state = ADHOC_STARTED;
} else {