staging: wilc1000: rename u8P2Plocalrandom variable

This patch renames u8P2Plocalrandom variable to p2p_local_random
to avoid camelcase.
And, remove the relation comment.

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/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6ab4a79e70e0928fb3727db8da0852bea40917e2..dd8d4040622b0760daa2dd289db63d844c066289 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -172,7 +172,7 @@ struct p2p_mgmt_data {
 static u8 wlan_channel = INVALID_CHANNEL;
 static u8 curr_channel;
 static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};
-static u8 u8P2Plocalrandom = 0x01;
+static u8 p2p_local_random = 0x01;
 static u8 u8P2Precvrandom = 0x00;
 static u8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
 static bool bWilc_ie;
@@ -641,7 +641,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
                wilc_optaining_ip = false;
                PRINT_ER("Received MAC_DISCONNECTED from firmware with reason %d on dev [%p]\n",
                         pstrDisconnectNotifInfo->u16reason, priv->dev);
-               u8P2Plocalrandom = 0x01;
+               p2p_local_random = 0x01;
                u8P2Precvrandom = 0x00;
                bWilc_ie = false;
                eth_zero_addr(priv->au8AssociatedBss);
@@ -1071,7 +1071,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
 
        PRINT_D(CFG80211_DBG, "Disconnecting with reason code(%d)\n", reason_code);
 
-       u8P2Plocalrandom = 0x01;
+       p2p_local_random = 0x01;
        u8P2Precvrandom = 0x00;
        bWilc_ie = false;
        pstrWFIDrv->p2p_timeout = 0;
@@ -2009,7 +2009,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size)
                                                                }
                                                        }
                                                }
-                                               if (u8P2Plocalrandom > u8P2Precvrandom) {
+                                               if (p2p_local_random > u8P2Precvrandom) {
                                                        if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP
                                                              || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
                                                                for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
@@ -2019,8 +2019,9 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size)
                                                                        }
                                                                }
                                                        }
-                                               } else
-                                                       PRINT_D(GENERIC_DBG, "PEER WILL BE GO LocaRand=%02x RecvRand %02x\n", u8P2Plocalrandom, u8P2Precvrandom);
+                                               } else {
+                                                       PRINT_D(GENERIC_DBG, "PEER WILL BE GO LocaRand=%02x RecvRand %02x\n", p2p_local_random, u8P2Precvrandom);
+                                               }
                                        }
 
 
@@ -2224,7 +2225,7 @@ static int mgmt_tx(struct wiphy *wiphy,
        struct host_if_drv *pstrWFIDrv;
        u32 i;
        perInterface_wlan_t *nic;
-       u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom);
+       u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(p2p_local_random);
 
        nic = netdev_priv(wdev->netdev);
        priv = wiphy_priv(wiphy);
@@ -2292,17 +2293,16 @@ static int mgmt_tx(struct wiphy *wiphy,
                                        if (!memcmp(p2p_oui, &buf[ACTION_SUBTYPE_ID + 1], 4)) {
                                                /*For the connection of two WILC's connection generate a rand number to determine who will be a GO*/
                                                if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP)) {
-                                                       if (u8P2Plocalrandom == 1 && u8P2Precvrandom < u8P2Plocalrandom) {
-                                                               get_random_bytes(&u8P2Plocalrandom, 1);
-                                                               /*Increment the number to prevent if its 0*/
-                                                               u8P2Plocalrandom++;
+                                                       if (p2p_local_random == 1 && u8P2Precvrandom < p2p_local_random) {
+                                                               get_random_bytes(&p2p_local_random, 1);
+                                                               p2p_local_random++;
                                                        }
                                                }
 
                                                if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP
                                                      || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
-                                                       if (u8P2Plocalrandom > u8P2Precvrandom) {
-                                                               PRINT_D(GENERIC_DBG, "LOCAL WILL BE GO LocaRand=%02x RecvRand %02x\n", u8P2Plocalrandom, u8P2Precvrandom);
+                                                       if (p2p_local_random > u8P2Precvrandom) {
+                                                               PRINT_D(GENERIC_DBG, "LOCAL WILL BE GO LocaRand=%02x RecvRand %02x\n", p2p_local_random, u8P2Precvrandom);
 
                                                                /*Search for the p2p information information element , after the Public action subtype theres a byte for teh dialog token, skip that*/
                                                                for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
@@ -2324,11 +2324,12 @@ static int mgmt_tx(struct wiphy *wiphy,
                                                                         * identify each other and connect
                                                                         */
                                                                        memcpy(&mgmt_tx->buff[len], u8P2P_vendorspec, sizeof(u8P2P_vendorspec));
-                                                                       mgmt_tx->buff[len + sizeof(u8P2P_vendorspec)] = u8P2Plocalrandom;
+                                                                       mgmt_tx->buff[len + sizeof(u8P2P_vendorspec)] = p2p_local_random;
                                                                        mgmt_tx->size = buf_len;
                                                                }
-                                                       } else
-                                                               PRINT_D(GENERIC_DBG, "PEER WILL BE GO LocaRand=%02x RecvRand %02x\n", u8P2Plocalrandom, u8P2Precvrandom);
+                                                       } else {
+                                                               PRINT_D(GENERIC_DBG, "PEER WILL BE GO LocaRand=%02x RecvRand %02x\n", p2p_local_random, u8P2Precvrandom);
+                                                       }
                                                }
 
                                        } else {
@@ -2557,7 +2558,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
 
        PRINT_D(HOSTAPD_DBG, "In Change virtual interface function\n");
        PRINT_D(HOSTAPD_DBG, "Wireless interface name =%s\n", dev->name);
-       u8P2Plocalrandom = 0x01;
+       p2p_local_random = 0x01;
        u8P2Precvrandom = 0x00;
 
        bWilc_ie = false;