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

staging: wilc1000: rename pstrHostIFscanAttr in handle_scan 

This patch renames pstrHostIFscanAttr to scan_info to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2016-04-04 20:04:47 +09:00 committed by Greg Kroah-Hartman
parent ba7eac31a1
commit 34b107eded
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/staging/wilc1000/host_interface.c
View File

@ -731,8 +731,7 @@ static s32 handle_cfg_param(struct wilc_vif *vif,
return result; return result;
} }
static s32 handle_scan(struct wilc_vif *vif, static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
struct scan_attr *pstrHostIFscanAttr)
{ {
s32 result = 0; s32 result = 0;
struct wid strWIDList[5]; struct wid strWIDList[5];
@ -743,8 +742,8 @@ static s32 handle_scan(struct wilc_vif *vif,
u8 *pu8HdnNtwrksWidVal = NULL; u8 *pu8HdnNtwrksWidVal = NULL;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
hif_drv->usr_scan_req.scan_result = pstrHostIFscanAttr->result; hif_drv->usr_scan_req.scan_result = scan_info->result;
hif_drv->usr_scan_req.arg = pstrHostIFscanAttr->arg; hif_drv->usr_scan_req.arg = scan_info->arg;
if ((hif_drv->hif_state >= HOST_IF_SCANNING) && if ((hif_drv->hif_state >= HOST_IF_SCANNING) &&
(hif_drv->hif_state < HOST_IF_CONNECTED)) { (hif_drv->hif_state < HOST_IF_CONNECTED)) {
@ -764,19 +763,19 @@ static s32 handle_scan(struct wilc_vif *vif,
strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ; strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
strWIDList[u32WidsCount].type = WID_STR; strWIDList[u32WidsCount].type = WID_STR;
for (i = 0; i < pstrHostIFscanAttr->hidden_network.n_ssids; i++) for (i = 0; i < scan_info->hidden_network.n_ssids; i++)
valuesize += ((pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len) + 1); valuesize += ((scan_info->hidden_network.net_info[i].ssid_len) + 1);
pu8HdnNtwrksWidVal = kmalloc(valuesize + 1, GFP_KERNEL); pu8HdnNtwrksWidVal = kmalloc(valuesize + 1, GFP_KERNEL);
strWIDList[u32WidsCount].val = pu8HdnNtwrksWidVal; strWIDList[u32WidsCount].val = pu8HdnNtwrksWidVal;
if (strWIDList[u32WidsCount].val) { if (strWIDList[u32WidsCount].val) {
pu8Buffer = strWIDList[u32WidsCount].val; pu8Buffer = strWIDList[u32WidsCount].val;
*pu8Buffer++ = pstrHostIFscanAttr->hidden_network.n_ssids; *pu8Buffer++ = scan_info->hidden_network.n_ssids;
for (i = 0; i < pstrHostIFscanAttr->hidden_network.n_ssids; i++) { for (i = 0; i < scan_info->hidden_network.n_ssids; i++) {
*pu8Buffer++ = pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len; *pu8Buffer++ = scan_info->hidden_network.net_info[i].ssid_len;
memcpy(pu8Buffer, pstrHostIFscanAttr->hidden_network.net_info[i].ssid, pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len); memcpy(pu8Buffer, scan_info->hidden_network.net_info[i].ssid, scan_info->hidden_network.net_info[i].ssid_len);
pu8Buffer += pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len; pu8Buffer += scan_info->hidden_network.net_info[i].ssid_len;
} }
strWIDList[u32WidsCount].size = (s32)(valuesize + 1); strWIDList[u32WidsCount].size = (s32)(valuesize + 1);
@ -785,37 +784,37 @@ static s32 handle_scan(struct wilc_vif *vif,
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE; strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE;
strWIDList[u32WidsCount].type = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].val = pstrHostIFscanAttr->ies; strWIDList[u32WidsCount].val = scan_info->ies;
strWIDList[u32WidsCount].size = pstrHostIFscanAttr->ies_len; strWIDList[u32WidsCount].size = scan_info->ies_len;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SCAN_TYPE; strWIDList[u32WidsCount].id = WID_SCAN_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&pstrHostIFscanAttr->type; strWIDList[u32WidsCount].val = (s8 *)&scan_info->type;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SCAN_CHANNEL_LIST; strWIDList[u32WidsCount].id = WID_SCAN_CHANNEL_LIST;
strWIDList[u32WidsCount].type = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
if (pstrHostIFscanAttr->ch_freq_list && if (scan_info->ch_freq_list &&
pstrHostIFscanAttr->ch_list_len > 0) { scan_info->ch_list_len > 0) {
int i; int i;
for (i = 0; i < pstrHostIFscanAttr->ch_list_len; i++) { for (i = 0; i < scan_info->ch_list_len; i++) {
if (pstrHostIFscanAttr->ch_freq_list[i] > 0) if (scan_info->ch_freq_list[i] > 0)
pstrHostIFscanAttr->ch_freq_list[i] = pstrHostIFscanAttr->ch_freq_list[i] - 1; scan_info->ch_freq_list[i] = scan_info->ch_freq_list[i] - 1;
} }
} }
strWIDList[u32WidsCount].val = pstrHostIFscanAttr->ch_freq_list; strWIDList[u32WidsCount].val = scan_info->ch_freq_list;
strWIDList[u32WidsCount].size = pstrHostIFscanAttr->ch_list_len; strWIDList[u32WidsCount].size = scan_info->ch_list_len;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_START_SCAN_REQ; strWIDList[u32WidsCount].id = WID_START_SCAN_REQ;
strWIDList[u32WidsCount].type = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&pstrHostIFscanAttr->src; strWIDList[u32WidsCount].val = (s8 *)&scan_info->src;
u32WidsCount++; u32WidsCount++;
if (hif_drv->hif_state == HOST_IF_CONNECTED) if (hif_drv->hif_state == HOST_IF_CONNECTED)
@ -836,13 +835,13 @@ static s32 handle_scan(struct wilc_vif *vif,
Handle_ScanDone(vif, SCAN_EVENT_ABORTED); Handle_ScanDone(vif, SCAN_EVENT_ABORTED);
} }
kfree(pstrHostIFscanAttr->ch_freq_list); kfree(scan_info->ch_freq_list);
pstrHostIFscanAttr->ch_freq_list = NULL; scan_info->ch_freq_list = NULL;
kfree(pstrHostIFscanAttr->ies); kfree(scan_info->ies);
pstrHostIFscanAttr->ies = NULL; scan_info->ies = NULL;
kfree(pstrHostIFscanAttr->hidden_network.net_info); kfree(scan_info->hidden_network.net_info);
pstrHostIFscanAttr->hidden_network.net_info = NULL; scan_info->hidden_network.net_info = NULL;
kfree(pu8HdnNtwrksWidVal); kfree(pu8HdnNtwrksWidVal);