staging: wilc1000: rename u64P2p_MgmtTimeout of struct host_if_drv

This patch renames u64P2p_MgmtTimeout of struct host_if_drv to p2p_timeout
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 294f90c2450796980b2011025c9af64a03379ec2..00f271780b838088f8aba2fabbb6c510ac1c86ae 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -4158,7 +4158,7 @@ s32 host_int_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
        hif_drv->cfg_values.passive_scan_time = PASSIVE_SCAN_TIME;
        hif_drv->cfg_values.curr_tx_rate = AUTORATE;
 
-       hif_drv->u64P2p_MgmtTimeout = 0;
+       hif_drv->p2p_timeout = 0;
 
        PRINT_INFO(HOSTINF_DBG, "Initialization values, Site survey value: %d\n Scan source: %d\n Active scan time: %d\n Passive scan time: %d\nCurrent tx Rate = %d\n",
                   hif_drv->cfg_values.site_survey_enabled,

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 8450e22acd7e86e2f9656673861ad9fdfde64657..c9a4ce8dfc7ee7c04e2b191f7b66525722978946 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -264,7 +264,7 @@ struct host_if_drv {
        struct user_conn_req usr_conn_req;
        struct remain_ch remain_on_ch;
        u8 remain_on_ch_pending;
-       u64 u64P2p_MgmtTimeout;
+       u64 p2p_timeout;
        u8 u8P2PConnect;
 
        enum host_if_state hif_state;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3060b8d3e149b7bc911bf0a3b8912e1ea7078187..116c37d2cda7b5e96b45c4a10943c63c0688f09c 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1050,7 +1050,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
        u8P2Plocalrandom = 0x01;
        u8P2Precvrandom = 0x00;
        bWilc_ie = false;
-       pstrWFIDrv->u64P2p_MgmtTimeout = 0;
+       pstrWFIDrv->p2p_timeout = 0;
 
        s32Error = host_int_disconnect(priv->hWILCWFIDrv, reason_code);
        if (s32Error != 0) {
@@ -1958,7 +1958,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size)
                if (ieee80211_is_action(buff[FRAME_TYPE_ID])) {
                        PRINT_D(GENERIC_DBG, "Rx Action Frame Type: %x %x\n", buff[ACTION_SUBTYPE_ID], buff[P2P_PUB_ACTION_SUBTYPE]);
 
-                       if (priv->bCfgScanning && time_after_eq(jiffies, (unsigned long)pstrWFIDrv->u64P2p_MgmtTimeout)) {
+                       if (priv->bCfgScanning && time_after_eq(jiffies, (unsigned long)pstrWFIDrv->p2p_timeout)) {
                                PRINT_D(GENERIC_DBG, "Receiving action frames from wrong channels\n");
                                return;
                        }
@@ -2331,10 +2331,10 @@ static int mgmt_tx(struct wiphy *wiphy,
                        }
 
                        PRINT_D(GENERIC_DBG, "TX: ACTION FRAME Type:%x : Chan:%d\n", buf[ACTION_SUBTYPE_ID], chan->hw_value);
-                       pstrWFIDrv->u64P2p_MgmtTimeout = (jiffies + msecs_to_jiffies(wait));
-
-                       PRINT_D(GENERIC_DBG, "Current Jiffies: %lu Timeout:%llu\n", jiffies, pstrWFIDrv->u64P2p_MgmtTimeout);
+                       pstrWFIDrv->p2p_timeout = (jiffies + msecs_to_jiffies(wait));
 
+                       PRINT_D(GENERIC_DBG, "Current Jiffies: %lu Timeout:%llu\n",
+                               jiffies, pstrWFIDrv->p2p_timeout);
                }
 
                wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff,
@@ -2358,7 +2358,7 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy,
 
 
        PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies);
-       pstrWFIDrv->u64P2p_MgmtTimeout = jiffies;
+       pstrWFIDrv->p2p_timeout = jiffies;
 
        if (!priv->bInP2PlistenState) {
                cfg80211_remain_on_channel_expired(priv->wdev,