staging: wilc1000: rename u8NoIfcs in the struct wilc

This patch renames u8NoIfcs of the struct wilc to the vif_num to avoid
CamelCase naming convention.

Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 191851b2769458a3ea502ba5409c08238740b18e..2bea103878fe802f9077ab8df315051d88e3afef 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -366,7 +366,7 @@ struct net_device *GetIfHandler(u8 *pMacHeader)
        Bssid  = pMacHeader + 10;
        Bssid1 = pMacHeader + 4;
 
-       for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
+       for (i = 0; i < g_linux_wlan->vif_num; i++) {
                if (!memcmp(Bssid1, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN) ||
                    !memcmp(Bssid, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN)) {
                        return g_linux_wlan->strInterfaceInfo[i].wilc_netdev;
@@ -377,7 +377,7 @@ struct net_device *GetIfHandler(u8 *pMacHeader)
                PRINT_D(INIT_DBG, "%02x ", pMacHeader[i]);
        Bssid  = pMacHeader + 18;
        Bssid1 = pMacHeader + 12;
-       for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
+       for (i = 0; i < g_linux_wlan->vif_num; i++) {
                if (!memcmp(Bssid1, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN) ||
                    !memcmp(Bssid, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN)) {
                        PRINT_D(INIT_DBG, "Ctx [%p]\n", g_linux_wlan->strInterfaceInfo[i].wilc_netdev);
@@ -394,7 +394,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID)
        int ret = -1;
 
        PRINT_D(INIT_DBG, "set bssid on[%p]\n", wilc_netdev);
-       for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
+       for (i = 0; i < g_linux_wlan->vif_num; i++) {
                if (g_linux_wlan->strInterfaceInfo[i].wilc_netdev == wilc_netdev) {
                        PRINT_D(INIT_DBG, "set bssid [%x][%x][%x]\n", pBSSID[0], pBSSID[1], pBSSID[2]);
                        memcpy(g_linux_wlan->strInterfaceInfo[i].aBSSID, pBSSID, 6);
@@ -412,7 +412,7 @@ int linux_wlan_get_num_conn_ifcs(void)
        u8 null_bssid[6] = {0};
        u8 ret_val = 0;
 
-       for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
+       for (i = 0; i < g_linux_wlan->vif_num; i++) {
                if (memcmp(g_linux_wlan->strInterfaceInfo[i].aBSSID, null_bssid, 6))
                        ret_val++;
        }
@@ -1316,7 +1316,7 @@ int mac_open(struct net_device *ndev)
        PRINT_D(INIT_DBG, "Mac address: %pM\n", mac_add);
 
        /* loop through the NUM of supported devices and set the MAC address */
-       for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
+       for (i = 0; i < g_linux_wlan->vif_num; i++) {
                if (ndev == g_linux_wlan->strInterfaceInfo[i].wilc_netdev) {
                        memcpy(g_linux_wlan->strInterfaceInfo[i].aSrcAddress, mac_add, ETH_ALEN);
                        g_linux_wlan->strInterfaceInfo[i].drvHandler = priv->hWILCWFIDrv;
@@ -1687,7 +1687,7 @@ void WILC_WFI_mgmt_rx(u8 *buff, u32 size)
 
        /*Pass the frame on the monitor interface, if any.*/
        /*Otherwise, pass it on p2p0 netdev, if registered on it*/
-       for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {
+       for (i = 0; i < g_linux_wlan->vif_num; i++) {
                nic = netdev_priv(g_linux_wlan->strInterfaceInfo[i].wilc_netdev);
                if (nic->monitor_flag) {
                        WILC_WFI_monitor_rx(buff, size);
@@ -1740,10 +1740,10 @@ int wilc_netdev_init(void)
                } else
                        strcpy(ndev->name, "p2p%d");
 
-               nic->u8IfIdx = g_linux_wlan->u8NoIfcs;
+               nic->u8IfIdx = g_linux_wlan->vif_num;
                nic->wilc_netdev = ndev;
-               g_linux_wlan->strInterfaceInfo[g_linux_wlan->u8NoIfcs].wilc_netdev = ndev;
-               g_linux_wlan->u8NoIfcs++;
+               g_linux_wlan->strInterfaceInfo[g_linux_wlan->vif_num].wilc_netdev = ndev;
+               g_linux_wlan->vif_num++;
                ndev->netdev_ops = &wilc_netdev_ops;
 
                {

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 863571abaecabe10bb3ddb8bc629dc6a525f9a97..a3f18b5ecb8bc27003ab0aa8f5c4d2c550e25e71 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -162,7 +162,7 @@ struct wilc {
        unsigned short dev_irq_num;
        #endif
        int close;
-       u8 u8NoIfcs;
+       u8 vif_num;
        struct wilc_vif strInterfaceInfo[NUM_CONCURRENT_IFC];
        u8 open_ifcs;