Commit bbff83db authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: rename strWIDList in handle_scan

This patch renames strWIDList to wid_list to avoid camelcase.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34b107ed
......@@ -734,7 +734,7 @@ static s32 handle_cfg_param(struct wilc_vif *vif,
static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
{
s32 result = 0;
struct wid strWIDList[5];
struct wid wid_list[5];
u32 u32WidsCount = 0;
u32 i;
u8 *pu8Buffer;
......@@ -760,15 +760,15 @@ static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
hif_drv->usr_scan_req.rcvd_ch_cnt = 0;
strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
strWIDList[u32WidsCount].type = WID_STR;
wid_list[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
wid_list[u32WidsCount].type = WID_STR;
for (i = 0; i < scan_info->hidden_network.n_ssids; i++)
valuesize += ((scan_info->hidden_network.net_info[i].ssid_len) + 1);
pu8HdnNtwrksWidVal = kmalloc(valuesize + 1, GFP_KERNEL);
strWIDList[u32WidsCount].val = pu8HdnNtwrksWidVal;
if (strWIDList[u32WidsCount].val) {
pu8Buffer = strWIDList[u32WidsCount].val;
wid_list[u32WidsCount].val = pu8HdnNtwrksWidVal;
if (wid_list[u32WidsCount].val) {
pu8Buffer = wid_list[u32WidsCount].val;
*pu8Buffer++ = scan_info->hidden_network.n_ssids;
......@@ -778,24 +778,24 @@ static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
pu8Buffer += scan_info->hidden_network.net_info[i].ssid_len;
}
strWIDList[u32WidsCount].size = (s32)(valuesize + 1);
wid_list[u32WidsCount].size = (s32)(valuesize + 1);
u32WidsCount++;
}
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].val = scan_info->ies;
strWIDList[u32WidsCount].size = scan_info->ies_len;
wid_list[u32WidsCount].id = WID_INFO_ELEMENT_PROBE;
wid_list[u32WidsCount].type = WID_BIN_DATA;
wid_list[u32WidsCount].val = scan_info->ies;
wid_list[u32WidsCount].size = scan_info->ies_len;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SCAN_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&scan_info->type;
wid_list[u32WidsCount].id = WID_SCAN_TYPE;
wid_list[u32WidsCount].type = WID_CHAR;
wid_list[u32WidsCount].size = sizeof(char);
wid_list[u32WidsCount].val = (s8 *)&scan_info->type;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SCAN_CHANNEL_LIST;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
wid_list[u32WidsCount].id = WID_SCAN_CHANNEL_LIST;
wid_list[u32WidsCount].type = WID_BIN_DATA;
if (scan_info->ch_freq_list &&
scan_info->ch_list_len > 0) {
......@@ -807,14 +807,14 @@ static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
}
}
strWIDList[u32WidsCount].val = scan_info->ch_freq_list;
strWIDList[u32WidsCount].size = scan_info->ch_list_len;
wid_list[u32WidsCount].val = scan_info->ch_freq_list;
wid_list[u32WidsCount].size = scan_info->ch_list_len;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_START_SCAN_REQ;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&scan_info->src;
wid_list[u32WidsCount].id = WID_START_SCAN_REQ;
wid_list[u32WidsCount].type = WID_CHAR;
wid_list[u32WidsCount].size = sizeof(char);
wid_list[u32WidsCount].val = (s8 *)&scan_info->src;
u32WidsCount++;
if (hif_drv->hif_state == HOST_IF_CONNECTED)
......@@ -822,7 +822,7 @@ static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
else if (hif_drv->hif_state == HOST_IF_IDLE)
scan_while_connected = false;
result = wilc_send_config_pkt(vif, SET_CFG, strWIDList,
result = wilc_send_config_pkt(vif, SET_CFG, wid_list,
u32WidsCount,
wilc_get_vif_idx(vif));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment