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

staging: wilc1000: rename 'rcvd_ch_cnt' element in 'user_scan_req' struct 

Cleanup patch to use shorter name for 'rcvd_ch_cnt' to 'ch_cnt' to avoid
line over 80 character issue reported by checkpatch.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-07-29 11:36:55 +05:30 committed by Greg Kroah-Hartman
parent 97ed6d34e3
commit 49328076f6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -792,7 +792,7 @@ static void handle_scan(struct work_struct *work)
goto error;
}
hif_drv->usr_scan_req.rcvd_ch_cnt = 0;
hif_drv->usr_scan_req.ch_cnt = 0;
wid_list[index].id = WID_SSID_PROBE_REQ;
wid_list[index].type = WID_STR;
@ -1406,7 +1406,7 @@ static void handle_rcvd_ntwrk_info(struct work_struct *work)
goto done;
}
for (i = 0; i < scan_req->rcvd_ch_cnt; i++) {
for (i = 0; i < scan_req->ch_cnt; i++) {
if (memcmp(scan_req->net_info[i].bssid, info->bssid, 6) == 0) {
if (info->rssi <= scan_req->net_info[i].rssi) {
goto done;
@ -1419,13 +1419,13 @@ static void handle_rcvd_ntwrk_info(struct work_struct *work)
}
if (found) {
if (scan_req->rcvd_ch_cnt < MAX_NUM_SCANNED_NETWORKS) {
scan_req->net_info[scan_req->rcvd_ch_cnt].rssi = info->rssi;
if (scan_req->ch_cnt < MAX_NUM_SCANNED_NETWORKS) {
scan_req->net_info[scan_req->ch_cnt].rssi = info->rssi;
memcpy(scan_req->net_info[scan_req->rcvd_ch_cnt].bssid,
memcpy(scan_req->net_info[scan_req->ch_cnt].bssid,
info->bssid, 6);
scan_req->rcvd_ch_cnt++;
scan_req->ch_cnt++;
info->new_network = true;
params = host_int_parse_join_bss_param(info);

2
drivers/staging/wilc1000/host_interface.h
View File

@ -199,7 +199,7 @@ struct hidden_network {
struct user_scan_req {
wilc_scan_result scan_result;
void *arg;
u32 rcvd_ch_cnt;
u32 ch_cnt;
struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS];
};