staging: wilc1000: rename u8P2PConnect of struct host_if_drv

This patch renames u8P2PConnect of struct host_if_drv to p2p_connect
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.h b/drivers/staging/wilc1000/host_interface.h
index c9a4ce8dfc7ee7c04e2b191f7b66525722978946..60dcc364e7563931ce065f8bae72b48c2516c9ce 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -265,7 +265,7 @@ struct host_if_drv {
        struct remain_ch remain_on_ch;
        u8 remain_on_ch_pending;
        u64 p2p_timeout;
-       u8 u8P2PConnect;
+       u8 p2p_connect;
 
        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 116c37d2cda7b5e96b45c4a10943c63c0688f09c..4828deb24e68120ee65685e996d98a6e2e2077d6 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -564,7 +564,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
                        eth_zero_addr(u8ConnectedSSID);
 
                        /*Invalidate u8WLANChannel value on wlan0 disconnect*/
-                       if (!pstrWFIDrv->u8P2PConnect)
+                       if (!pstrWFIDrv->p2p_connect)
                                u8WLANChannel = INVALID_CHANNEL;
 
                        PRINT_ER("Unspecified failure: Connection status %d : MAC status = %d\n", u16ConnectStatus, u8MacStatus);
@@ -623,7 +623,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
                eth_zero_addr(u8ConnectedSSID);
 
                /*Invalidate u8WLANChannel value on wlan0 disconnect*/
-               if (!pstrWFIDrv->u8P2PConnect)
+               if (!pstrWFIDrv->p2p_connect)
                        u8WLANChannel = INVALID_CHANNEL;
                /*Incase "P2P CLIENT Connected" send deauthentication reason by 3 to force the WPA_SUPPLICANT to directly change
                 *      virtual interface to station*/
@@ -804,9 +804,10 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
        PRINT_D(CFG80211_DBG, "Connecting to SSID [%s] on netdev [%p] host if [%p]\n", sme->ssid, dev, priv->hWILCWFIDrv);
        if (!(strncmp(sme->ssid, "DIRECT-", 7))) {
                PRINT_D(CFG80211_DBG, "Connected to Direct network,OBSS disabled\n");
-               pstrWFIDrv->u8P2PConnect = 1;
-       } else
-               pstrWFIDrv->u8P2PConnect = 0;
+               pstrWFIDrv->p2p_connect = 1;
+       } else {
+               pstrWFIDrv->p2p_connect = 0;
+       }
        PRINT_INFO(CFG80211_DBG, "Required SSID = %s\n , AuthType = %d\n", sme->ssid, sme->auth_type);
 
        for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
@@ -997,9 +998,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 
        curr_channel = pstrNetworkInfo->u8channel;
 
-       if (!pstrWFIDrv->u8P2PConnect) {
+       if (!pstrWFIDrv->p2p_connect)
                u8WLANChannel = pstrNetworkInfo->u8channel;
-       }
 
        linux_wlan_set_bssid(dev, pstrNetworkInfo->au8bssid);
 
@@ -1041,7 +1041,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
 
        /*Invalidate u8WLANChannel value on wlan0 disconnect*/
        pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
-       if (!pstrWFIDrv->u8P2PConnect)
+       if (!pstrWFIDrv->p2p_connect)
                u8WLANChannel = INVALID_CHANNEL;
        linux_wlan_set_bssid(priv->dev, NullBssid);