staging: wilc1000: rename astrFoundNetworkInfo of struct user_scan_req

This patch renames astrFoundNetworkInfo of struct user_scan_req to net_info
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 3648e3cf642d967433ecd92dddfad58fb3e79d7a..35a1262e9098361ce9442a8b0476032e3646a299 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1415,15 +1415,15 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
                }
 
                for (i = 0; i < hif_drv->usr_scan_req.u32RcvdChCount; i++) {
-                       if ((hif_drv->usr_scan_req.astrFoundNetworkInfo[i].au8bssid) &&
+                       if ((hif_drv->usr_scan_req.net_info[i].au8bssid) &&
                            (pstrNetworkInfo->au8bssid)) {
-                               if (memcmp(hif_drv->usr_scan_req.astrFoundNetworkInfo[i].au8bssid,
+                               if (memcmp(hif_drv->usr_scan_req.net_info[i].au8bssid,
                                           pstrNetworkInfo->au8bssid, 6) == 0) {
-                                       if (pstrNetworkInfo->s8rssi <= hif_drv->usr_scan_req.astrFoundNetworkInfo[i].s8rssi) {
+                                       if (pstrNetworkInfo->s8rssi <= hif_drv->usr_scan_req.net_info[i].s8rssi) {
                                                PRINT_D(HOSTINF_DBG, "Network previously discovered\n");
                                                goto done;
                                        } else {
-                                               hif_drv->usr_scan_req.astrFoundNetworkInfo[i].s8rssi = pstrNetworkInfo->s8rssi;
+                                               hif_drv->usr_scan_req.net_info[i].s8rssi = pstrNetworkInfo->s8rssi;
                                                bNewNtwrkFound = false;
                                                break;
                                        }
@@ -1435,11 +1435,11 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
                        PRINT_D(HOSTINF_DBG, "New network found\n");
 
                        if (hif_drv->usr_scan_req.u32RcvdChCount < MAX_NUM_SCANNED_NETWORKS) {
-                               hif_drv->usr_scan_req.astrFoundNetworkInfo[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi = pstrNetworkInfo->s8rssi;
+                               hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi = pstrNetworkInfo->s8rssi;
 
-                               if (hif_drv->usr_scan_req.astrFoundNetworkInfo[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid &&
+                               if (hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid &&
                                    pstrNetworkInfo->au8bssid) {
-                                       memcpy(hif_drv->usr_scan_req.astrFoundNetworkInfo[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid,
+                                       memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid,
                                               pstrNetworkInfo->au8bssid, 6);
 
                                        hif_drv->usr_scan_req.u32RcvdChCount++;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 058ea17379071f8f84f7224ff7e21e08f388553c..dcb68eae24a0fa498cb38af2fb91286ff6604ea4 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -195,7 +195,7 @@ struct user_scan_req {
        wilc_scan_result scan_result;
        void *arg;
        u32 u32RcvdChCount;
-       struct found_net_info astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
+       struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS];
 };
 
 struct user_conn_req {