Commit f79756ee authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename u32RcvdChCount of struct user_scan_req

This patch renames u32RcvdChCount of struct user_scan_req to rcvd_ch_cnt
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2141fe39
...@@ -843,7 +843,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv, ...@@ -843,7 +843,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Setting SCAN params\n"); PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
hif_drv->usr_scan_req.u32RcvdChCount = 0; hif_drv->usr_scan_req.rcvd_ch_cnt = 0;
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;
...@@ -1414,7 +1414,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, ...@@ -1414,7 +1414,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
goto done; goto done;
} }
for (i = 0; i < hif_drv->usr_scan_req.u32RcvdChCount; i++) { for (i = 0; i < hif_drv->usr_scan_req.rcvd_ch_cnt; i++) {
if ((hif_drv->usr_scan_req.net_info[i].au8bssid) && if ((hif_drv->usr_scan_req.net_info[i].au8bssid) &&
(pstrNetworkInfo->au8bssid)) { (pstrNetworkInfo->au8bssid)) {
if (memcmp(hif_drv->usr_scan_req.net_info[i].au8bssid, if (memcmp(hif_drv->usr_scan_req.net_info[i].au8bssid,
...@@ -1434,15 +1434,15 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, ...@@ -1434,15 +1434,15 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
if (bNewNtwrkFound) { if (bNewNtwrkFound) {
PRINT_D(HOSTINF_DBG, "New network found\n"); PRINT_D(HOSTINF_DBG, "New network found\n");
if (hif_drv->usr_scan_req.u32RcvdChCount < MAX_NUM_SCANNED_NETWORKS) { if (hif_drv->usr_scan_req.rcvd_ch_cnt < MAX_NUM_SCANNED_NETWORKS) {
hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi = pstrNetworkInfo->s8rssi; hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].s8rssi = pstrNetworkInfo->s8rssi;
if (hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid && if (hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].au8bssid &&
pstrNetworkInfo->au8bssid) { pstrNetworkInfo->au8bssid) {
memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid, memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].au8bssid,
pstrNetworkInfo->au8bssid, 6); pstrNetworkInfo->au8bssid, 6);
hif_drv->usr_scan_req.u32RcvdChCount++; hif_drv->usr_scan_req.rcvd_ch_cnt++;
pstrNetworkInfo->bNewNetwork = true; pstrNetworkInfo->bNewNetwork = true;
pJoinParams = host_int_ParseJoinBssParam(pstrNetworkInfo); pJoinParams = host_int_ParseJoinBssParam(pstrNetworkInfo);
......
...@@ -198,7 +198,7 @@ struct hidden_network { ...@@ -198,7 +198,7 @@ struct hidden_network {
struct user_scan_req { struct user_scan_req {
wilc_scan_result scan_result; wilc_scan_result scan_result;
void *arg; void *arg;
u32 u32RcvdChCount; u32 rcvd_ch_cnt;
struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS]; struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS];
}; };
......
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