lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:   Sun, 11 Jun 2017 23:57:55 +0530
From:   Jaya Durga <jayad@...c.in>
To:     gregkh@...uxfoundation.org
Cc:     Larry.Finger@...inger.net, florian.c.schilhabel@...glemail.com,
        driverdev-devel@...uxdriverproject.org, devel@...verdev.osuosl.org,
        linux-kernel@...r.kernel.org, Jaya Durga <jayad@...c.in>
Subject: [PATCH 7/9] Staging: rtl8712: ieee80211: fixed camelcase coding style issue

Fixed coding style issue

Renamed IEs to ie_s

Signed-off-by: Jaya Durga <jayad@...c.in>
---
 drivers/staging/rtl8712/ieee80211.c           |  2 +-
 drivers/staging/rtl8712/rtl871x_cmd.c         | 20 ++++++++++----------
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 16 ++++++++--------
 drivers/staging/rtl8712/rtl871x_mlme.c        | 20 ++++++++++----------
 drivers/staging/rtl8712/wlan_bssdef.h         |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/rtl8712/ieee80211.c b/drivers/staging/rtl8712/ieee80211.c
index 200677c..0da86a6 100644
--- a/drivers/staging/rtl8712/ieee80211.c
+++ b/drivers/staging/rtl8712/ieee80211.c
@@ -168,7 +168,7 @@ int r8712_generate_ie(struct registry_priv *pregistrypriv)
 {
 	int sz = 0, rate_len;
 	struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
-	u8 *ie = pdev_network->IEs;
+	u8 *ie = pdev_network->ie_s;
 
 	/*timestamp will be inserted by hardware*/
 	sz += 8;
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 04638f1..640723b 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -489,10 +489,10 @@ u8 r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
 					     psecnetwork->IELength;
 	if ((psecnetwork->IELength - 12) < (256 - 1))
 		memcpy(&psecuritypriv->authenticator_ie[1],
-			&psecnetwork->IEs[12], psecnetwork->IELength - 12);
+			&psecnetwork->ie_s[12], psecnetwork->IELength - 12);
 	else
 		memcpy(&psecuritypriv->authenticator_ie[1],
-			&psecnetwork->IEs[12], (256 - 1));
+			&psecnetwork->ie_s[12], (256 - 1));
 	psecnetwork->IELength = 0;
 	/*
 	 * If the driver wants to use the bssid to create the connection.
@@ -503,16 +503,16 @@ u8 r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
 		ether_addr_copy(&pmlmepriv->assoc_bssid[0],
 				&pnetwork->network.MacAddress[0]);
 	psecnetwork->IELength = r8712_restruct_sec_ie(padapter,
-						&pnetwork->network.IEs[0],
-						&psecnetwork->IEs[0],
+						&pnetwork->network.ie_s[0],
+						&psecnetwork->ie_s[0],
 						pnetwork->network.IELength);
 	pqospriv->qos_option = 0;
 	if (pregistrypriv->wmm_enable) {
 		u32 tmp_len;
 
 		tmp_len = r8712_restruct_wmm_ie(padapter,
-					  &pnetwork->network.IEs[0],
-					  &psecnetwork->IEs[0],
+					  &pnetwork->network.ie_s[0],
+					  &psecnetwork->ie_s[0],
 					  pnetwork->network.IELength,
 					  psecnetwork->IELength);
 		if (psecnetwork->IELength != tmp_len) {
@@ -532,18 +532,18 @@ u8 r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
 		    (padapter->securitypriv.PrivacyAlgrthm != _WEP104_)) {
 			/* restructure_ht_ie */
 			r8712_restructure_ht_ie(padapter,
-						&pnetwork->network.IEs[0],
-						&psecnetwork->IEs[0],
+						&pnetwork->network.ie_s[0],
+						&psecnetwork->ie_s[0],
 						pnetwork->network.IELength,
 						&psecnetwork->IELength);
 		}
 	}
 	psecuritypriv->supplicant_ie[0] = (u8)psecnetwork->IELength;
 	if (psecnetwork->IELength < 255)
-		memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0],
+		memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->ie_s[0],
 			psecnetwork->IELength);
 	else
-		memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0],
+		memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->ie_s[0],
 			255);
 	/* get cmdsz before endian conversion */
 	pcmd->cmdsz = r8712_get_wlan_bssid_ex_sz(psecnetwork);
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 6adb4e5..7b2cef3 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -169,7 +169,7 @@ static noinline_for_stack char *translate_scan(struct _adapter *padapter,
 	start = iwe_stream_add_point(info, start, stop, &iwe,
 				     pnetwork->network.Ssid.Ssid);
 	/* parsing HT_CAP_IE */
-	p = r8712_get_ie(&pnetwork->network.IEs[12], _HT_CAPABILITY_IE_,
+	p = r8712_get_ie(&pnetwork->network.ie_s[12], _HT_CAPABILITY_IE_,
 			 &ht_ielen, pnetwork->network.IELength - 12);
 	if (p && ht_ielen > 0) {
 		ht_cap = true;
@@ -197,7 +197,7 @@ static noinline_for_stack char *translate_scan(struct _adapter *padapter,
 	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
 	/* Add mode */
 	iwe.cmd = SIOCGIWMODE;
-	memcpy((u8 *)&cap, r8712_get_capability_from_ie(pnetwork->network.IEs),
+	memcpy((u8 *)&cap, r8712_get_capability_from_ie(pnetwork->network.ie_s),
 		2);
 	le16_to_cpus(&cap);
 	if (cap & (WLAN_CAPABILITY_IBSS | WLAN_CAPABILITY_BSS)) {
@@ -261,7 +261,7 @@ static noinline_for_stack char *translate_scan(struct _adapter *padapter,
 		u16 wpa_len = 0, rsn_len = 0;
 		int n;
 
-		r8712_get_sec_ie(pnetwork->network.IEs,
+		r8712_get_sec_ie(pnetwork->network.ie_s,
 				 pnetwork->network.IELength, rsn_ie, &rsn_len,
 				 wpa_ie, &wpa_len);
 		if (wpa_len > 0) {
@@ -310,7 +310,7 @@ static noinline_for_stack char *translate_scan(struct _adapter *padapter,
 		u8 wps_ie[512];
 		uint wps_ielen;
 
-		if (r8712_get_wps_ie(pnetwork->network.IEs,
+		if (r8712_get_wps_ie(pnetwork->network.ie_s,
 		    pnetwork->network.IELength,
 		    wps_ie, &wps_ielen)) {
 			if (wps_ielen > 2) {
@@ -615,7 +615,7 @@ static int r8711_wx_get_name(struct net_device *dev,
 	if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE) ==
 	    true) {
 		/* parsing HT_CAP_IE */
-		p = r8712_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_,
+		p = r8712_get_ie(&pcur_bss->ie_s[12], _HT_CAPABILITY_IE_,
 				 &ht_ielen, pcur_bss->IELength - 12);
 		if (p && ht_ielen > 0)
 			ht_cap = true;
@@ -1413,7 +1413,7 @@ static int r8711_wx_get_rate(struct net_device *dev,
 
 	i = 0;
 	if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE)) {
-		p = r8712_get_ie(&pcur_bss->IEs[12],
+		p = r8712_get_ie(&pcur_bss->ie_s[12],
 				 _HT_CAPABILITY_IE_, &ht_ielen,
 		    pcur_bss->IELength - 12);
 		if (p && ht_ielen > 0) {
@@ -1998,13 +1998,13 @@ static int r871x_get_ap_info(struct net_device *dev,
 		netdev_info(dev, "r8712u: BSSID:%pM\n", bssid);
 		if (ether_addr_equal(bssid, pnetwork->network.MacAddress)) {
 			/* BSSID match, then check if supporting wpa/wpa2 */
-			pbuf = r8712_get_wpa_ie(&pnetwork->network.IEs[12],
+			pbuf = r8712_get_wpa_ie(&pnetwork->network.ie_s[12],
 			       &wpa_ielen, pnetwork->network.IELength - 12);
 			if (pbuf && (wpa_ielen > 0)) {
 				pdata->flags = 1;
 				break;
 			}
-			pbuf = r8712_get_wpa2_ie(&pnetwork->network.IEs[12],
+			pbuf = r8712_get_wpa2_ie(&pnetwork->network.ie_s[12],
 			       &wpa_ielen, pnetwork->network.IELength - 12);
 			if (pbuf && (wpa_ielen > 0)) {
 				pdata->flags = 2;
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 4d7dd84..3750288 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -273,8 +273,8 @@ static int is_same_network(struct wlan_bssid_ex *src,
 {
 	 u16 s_cap, d_cap;
 
-	memcpy((u8 *)&s_cap, r8712_get_capability_from_ie(src->IEs), 2);
-	memcpy((u8 *)&d_cap, r8712_get_capability_from_ie(dst->IEs), 2);
+	memcpy((u8 *)&s_cap, r8712_get_capability_from_ie(src->ie_s), 2);
+	memcpy((u8 *)&d_cap, r8712_get_capability_from_ie(dst->ie_s), 2);
 	return (src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
 			(src->configuration.ds_config ==
 			dst->configuration.ds_config) &&
@@ -361,7 +361,7 @@ static void update_current_network(struct _adapter *adapter,
 		update_network(&(pmlmepriv->cur_network.network),
 			       pnetwork, adapter);
 		r8712_update_protection(adapter,
-			       (pmlmepriv->cur_network.network.IEs) +
+			       (pmlmepriv->cur_network.network.ie_s) +
 			       sizeof(struct NDIS_802_11_FIXED_IEs),
 			       pmlmepriv->cur_network.network.IELength);
 	}
@@ -461,7 +461,7 @@ static int is_desired_network(struct _adapter *adapter,
 	struct	security_priv *psecuritypriv = &adapter->securitypriv;
 
 	if (psecuritypriv->wps_phase) {
-		if (r8712_get_wps_ie(pnetwork->network.IEs,
+		if (r8712_get_wps_ie(pnetwork->network.ie_s,
 		    pnetwork->network.IELength, wps_ie,
 		    &wps_ielen))
 			return true;
@@ -529,14 +529,14 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
 		    pnetwork->MacAddress, ETH_ALEN)) {
 			struct wlan_network *ibss_wlan = NULL;
 
-			memcpy(pmlmepriv->cur_network.network.IEs,
-				pnetwork->IEs, 8);
+			memcpy(pmlmepriv->cur_network.network.ie_s,
+				pnetwork->ie_s, 8);
 			ibss_wlan = r8712_find_network(
 						&pmlmepriv->scanned_queue,
 						pnetwork->MacAddress);
 			if (ibss_wlan) {
-				memcpy(ibss_wlan->network.IEs,
-					pnetwork->IEs, 8);
+				memcpy(ibss_wlan->network.ie_s,
+					pnetwork->ie_s, 8);
 				goto exit;
 			}
 		}
@@ -883,11 +883,11 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
 				break;
 			}
 			r8712_update_protection(adapter,
-					  (cur_network->network.IEs) +
+					  (cur_network->network.ie_s) +
 					  sizeof(struct NDIS_802_11_FIXED_IEs),
 					  (cur_network->network.IELength));
 			/*TODO: update HT_Capability*/
-			update_ht_cap(adapter, cur_network->network.IEs,
+			update_ht_cap(adapter, cur_network->network.ie_s,
 				      cur_network->network.IELength);
 			/*indicate connect*/
 			if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 27fd5aa6..a086d14 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -92,7 +92,7 @@ struct wlan_bssid_ex {
 	/* number of content bytes in EIs, which varies */
 	u32 IELength;
 	/*(timestamp, beacon interval, and capability information) */
-	u8 IEs[MAX_IE_SZ];
+	u8 ie_s[MAX_IE_SZ];
 };
 
 enum NDIS_802_11_AUTHENTICATION_MODE {
-- 
1.9.1

Powered by blists - more mailing lists