All of lore.kernel.org
 help / color / mirror / Atom feed
From: Glen Lee <glen.lee@atmel.com>
To: <gregkh@linuxfoundation.org>
Cc: <devel@driverdev.osuosl.org>, <linux-wireless@vger.kernel.org>,
	<tony.cho@atmel.com>, <glen.lee@atmel.com>, <leo.kim@atmel.com>,
	<austin.shin@atmel.com>, <adel.noureldin@atmel.com>,
	<adham.abozaeid@atmel.com>, <Nicolas.FERRE@atmel.com>
Subject: [PATCH 64/80] staging: wilc1000: rename u8P2PConnect of struct host_if_drv
Date: Wed, 28 Oct 2015 16:07:09 +0900	[thread overview]
Message-ID: <1446016045-32154-14-git-send-email-glen.lee@atmel.com> (raw)
In-Reply-To: <1446016045-32154-1-git-send-email-glen.lee@atmel.com>

From: Leo Kim <leo.kim@atmel.com>

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>
---
 drivers/staging/wilc1000/host_interface.h         |  2 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 5876209..4991d55 100644
--- 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 bacf762..2fdf856 100644
--- 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);
 
-- 
1.9.1


  parent reply	other threads:[~2015-10-28  7:05 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-28  7:06 [PATCH 51/80] staging: wilc1000: rename u32UserConnectPvoid of struct user_conn_req Glen Lee
2015-10-28  7:06 ` [PATCH 52/80] staging: wilc1000: host_interface.h: move local define variables Glen Lee
2015-10-28  7:06 ` [PATCH 53/80] staging: wilc1000: rename u8LinkSpeed of struct rf_info Glen Lee
2015-10-28  7:06 ` [PATCH 54/80] staging: wilc1000: rename s8RSSI " Glen Lee
2015-10-28  7:07 ` [PATCH 55/80] staging: wilc1000: rename u32TxCount " Glen Lee
2015-10-28  7:07 ` [PATCH 56/80] staging: wilc1000: rename u32RxCount " Glen Lee
2015-10-28  7:07 ` [PATCH 57/80] staging: wilc1000: rename u32TxFailureCount " Glen Lee
2015-10-28  7:07 ` [PATCH 58/80] staging: wilc1000: rename WPARxGtk of enum KEY_TYPE Glen Lee
2015-10-28  7:07 ` [PATCH 59/80] staging: wilc1000: rename WPAPtk " Glen Lee
2015-10-28  7:07 ` [PATCH 60/80] staging: wilc1000: rename u32RcvdChCount of struct user_scan_req Glen Lee
2015-10-28  7:07 ` [PATCH 61/80] staging: wilc1000: rename tenuAuth_type of struct user_conn_req Glen Lee
2015-10-28  7:07 ` [PATCH 62/80] staging: wilc1000: rename u32ListenSessionID of struct remain_ch Glen Lee
2015-10-28  7:07 ` [PATCH 63/80] staging: wilc1000: rename u64P2p_MgmtTimeout of struct host_if_drv Glen Lee
2015-10-28  7:07 ` Glen Lee [this message]
2015-10-28  7:07 ` [PATCH 65/80] staging: wilc1000: rename au8BSSID of struct add_sta_param Glen Lee
2015-10-28  7:07 ` [PATCH 66/80] staging: wilc1000: rename u16AssocID " Glen Lee
2015-10-28  7:07 ` [PATCH 67/80] staging: wilc1000: rename u8NumRates " Glen Lee
2015-10-28  7:07 ` [PATCH 68/80] staging: wilc1000: rename pu8Rates " Glen Lee
2015-10-28  7:07 ` [PATCH 69/80] staging: wilc1000: rename bIsHTSupported " Glen Lee
2015-10-28  7:07 ` [PATCH 70/80] staging: wilc1000: rename u16HTCapInfo " Glen Lee
2015-10-28  7:07 ` [PATCH 71/80] staging: wilc1000: rename u8AmpduParams " Glen Lee
2015-10-28  7:07 ` [PATCH 72/80] staging: wilc1000: rename au8SuppMCsSet " Glen Lee
2015-10-28  7:07 ` [PATCH 73/80] staging: wilc1000: rename u16HTExtParams " Glen Lee
2015-10-28  7:07 ` [PATCH 74/80] staging: wilc1000: rename u32TxBeamformingCap " Glen Lee
2015-10-28  7:07 ` [PATCH 75/80] staging: wilc1000: rename u8ASELCap " Glen Lee
2015-10-28  7:07 ` [PATCH 76/80] staging: wilc1000: rename u16FlagsMask " Glen Lee
2015-10-28  7:07 ` [PATCH 77/80] staging: wilc1000: rename u16FlagsSet " Glen Lee
2015-10-28  7:07 ` [PATCH 78/80] staging: wilc1000: rename pstrHostIFSetChan of fuction Handle_SetChannel Glen Lee
2015-10-28  7:07 ` [PATCH 79/80] staging: wilc1000: rename pstrHostIfSetDrvHandler of fuction Handle_SetWfiDrvHandler Glen Lee
2015-10-28  7:07 ` [PATCH 80/80] staging: wilc1000: rename pstrHostIfSetOperationMode of fuction Handle_SetOperationMode Glen Lee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1446016045-32154-14-git-send-email-glen.lee@atmel.com \
    --to=glen.lee@atmel.com \
    --cc=Nicolas.FERRE@atmel.com \
    --cc=adel.noureldin@atmel.com \
    --cc=adham.abozaeid@atmel.com \
    --cc=austin.shin@atmel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=leo.kim@atmel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=tony.cho@atmel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.