Staging: rtl8712: ieee80211: fixed camelcase coding style issue

Fixed coding style issue

Renamed IEs to ie_s

---
 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(-)

index 200677c..0da86a6 100644
@@ -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;

index 04638f1..640723b 100644
@@ -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);

index 6adb4e5..7b2cef3 100644
@@ -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;

index 4d7dd84..3750288 100644
@@ -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))

index 27fd5aa6..a086d14 100644
@@ -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

Fixed coding style issue

Renamed Privacy to privacy

---
 drivers/staging/rtl8712/ieee80211.c    | 2 +-
 drivers/staging/rtl8712/rtl871x_mlme.c | 8 ++++----
 drivers/staging/rtl8712/wlan_bssdef.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

index 0da86a6..5956fd4 100644
@@ -183,7 +183,7 @@ int r8712_generate_ie(struct registry_priv *pregistrypriv)
 	*(__le16 *)ie |= cpu_to_le16(cap_IBSS);
 	if (pregistrypriv->preamble == PREAMBLE_SHORT)
 		*(__le16 *)ie |= cpu_to_le16(cap_short_premble);
-	if (pdev_network->Privacy)
+	if (pdev_network->privacy)
 		*(__le16 *)ie |= cpu_to_le16(cap_privacy);
 	sz += 2;
 	ie += 2;

index 3750288..9d647c4 100644
@@ -257,10 +257,10 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork)
 	struct security_priv *psecuritypriv = &adapter->securitypriv;
 
 	if ((psecuritypriv->PrivacyAlgrthm != _NO_PRIVACY_) &&
-		    (pnetwork->network.Privacy == cpu_to_le32(0)))
+		    (pnetwork->network.privacy == cpu_to_le32(0)))
 		ret = false;
 	else if ((psecuritypriv->PrivacyAlgrthm == _NO_PRIVACY_) &&
-		 (pnetwork->network.Privacy == cpu_to_le32(1)))
+		 (pnetwork->network.privacy == cpu_to_le32(1)))
 		ret = false;
 	else
 		ret = true;

@@ -468,7 +468,7 @@ static int is_desired_network(struct _adapter *adapter,
 		return false;
 	}
 	if ((psecuritypriv->PrivacyAlgrthm != _NO_PRIVACY_) &&
-		    (pnetwork->network.Privacy == 0))
+		    (pnetwork->network.privacy == 0))
 		bselected = false;
 	if (check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE)) {
 		if (pnetwork->network.InfrastructureMode !=

@@ -1632,7 +1632,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
 	struct security_priv	*psecuritypriv = &adapter->securitypriv;
 	struct wlan_network	*cur_network = &adapter->mlmepriv.cur_network;
 
-	pdev_network->Privacy = cpu_to_le32(psecuritypriv->PrivacyAlgrthm
+	pdev_network->privacy = cpu_to_le32(psecuritypriv->PrivacyAlgrthm
 					    > 0 ? 1 : 0); /* adhoc no 802.1x */
 	pdev_network->Rssi = 0;
 	switch (pregistrypriv->wireless_mode) {

index a086d14..6354fc2 100644
@@ -83,7 +83,7 @@ struct wlan_bssid_ex {
 	unsigned char  MacAddress[6];
 	u8  Reserved[2];
 	struct ndis_802_11_ssid  Ssid;
-	__le32 Privacy;
+	__le32 privacy;
 	s32 Rssi;
 	enum NDIS_802_11_NETWORK_TYPE  NetworkTypeInUse;
 	struct NDIS_802_11_CONFIGURATION  configuration;

1.9.1

Fixed coding style issue

Renamed Ssid to ssid
Renamed Ssid_Length to ssid_length

---
 drivers/staging/rtl8712/ieee80211.c           |  4 ++--
 drivers/staging/rtl8712/os_intfs.c            |  4 ++--
 drivers/staging/rtl8712/rtl871x_cmd.c         |  8 +++----
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 30 ++++++++++++-------------
 drivers/staging/rtl8712/rtl871x_ioctl_set.c   | 14 ++++++------
 drivers/staging/rtl8712/rtl871x_mlme.c        | 32 +++++++++++++--------------
 drivers/staging/rtl8712/rtl871x_mp_ioctl.c    |  6 ++---
 drivers/staging/rtl8712/wlan_bssdef.h         |  6 ++---
 8 files changed, 52 insertions(+), 52 deletions(-)

index 5956fd4..6e673c1 100644
@@ -188,8 +188,8 @@ int r8712_generate_ie(struct registry_priv *pregistrypriv)

	sz += 2;
	ie += 2;
	/*SSID*/
-	ie = r8712_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength,
-			  pdev_network->Ssid.Ssid, &sz);
+	ie = r8712_set_ie(ie, _SSID_IE_, pdev_network->ssid.ssid_length,
+			  pdev_network->ssid.ssid, &sz);
	/*supported rates*/
	set_supported_rate(pdev_network->rates, pregistrypriv->wireless_mode);
	rate_len = r8712_get_rateset_len(pdev_network->rates);

index cbe4de0..15a6b05 100644
@@ -134,8 +134,8 @@ static void loadparam(struct _adapter *padapter, struct  net_device *pnetdev)

	registry_par->lbkmode = (u8)lbkmode;
	registry_par->hci = (u8)hci;
	registry_par->network_mode  = (u8)network_mode;
-	memcpy(registry_par->ssid.Ssid, "ANY", 3);
-	registry_par->ssid.SsidLength = 3;
+	memcpy(registry_par->ssid.ssid, "ANY", 3);
+	registry_par->ssid.ssid_length = 3;
	registry_par->channel = (u8)channel;
	registry_par->wireless_mode = (u8)wireless_mode;
	registry_par->vrtl_carrier_sense = (u8)vrtl_carrier_sense;

index 640723b..2696645 100644
@@ -241,9 +241,9 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,

	psurveyPara->passive_mode = cpu_to_le32(pmlmepriv->passive_mode);
	psurveyPara->ss_ssidlen = 0;
	memset(psurveyPara->ss_ssid, 0, IW_ESSID_MAX_SIZE + 1);

- if ((pssid != NULL) && (pssid->SsidLength)) {
- memcpy(psurveyPara->ss_ssid, pssid->Ssid, pssid->SsidLength);
- psurveyPara->ss_ssidlen = cpu_to_le32(pssid->SsidLength);
+ if ((pssid != NULL) && (pssid->ssid_length)) {
+ memcpy(psurveyPara->ss_ssid, pssid->ssid, pssid->ssid_length);

+		psurveyPara->ss_ssidlen = cpu_to_le32(pssid->ssid_length);
	}
	set_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
	r8712_enqueue_cmd(pcmdpriv, ph2c);
@@ -441,7 +441,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
	/* notes: translate IELength & Length after assign to cmdsz; */
	pdev_network->Length = pcmd->cmdsz;
	pdev_network->IELength = pdev_network->IELength;
-	pdev_network->Ssid.SsidLength =	pdev_network->Ssid.SsidLength;
+	pdev_network->ssid.ssid_length =	pdev_network->ssid.ssid_length;
	r8712_enqueue_cmd(pcmdpriv, pcmd);
	return _SUCCESS;

}

index 7b2cef3..212d98b 100644
@@ -165,9 +165,9 @@ static noinline_for_stack char *translate_scan(struct _adapter *padapter,

	/* Add the ESSID */
	iwe.cmd = SIOCGIWESSID;
	iwe.u.data.flags = 1;

- iwe.u.data.length = min_t(u32, pnetwork->network.Ssid.SsidLength, 32);
+ iwe.u.data.length = min_t(u32, pnetwork->network.ssid.ssid_length, 32);
start = iwe_stream_add_point(info, start, stop, &iwe,
- pnetwork->network.Ssid.Ssid);

+				     pnetwork->network.ssid.ssid);
	/* parsing HT_CAP_IE */
	p = r8712_get_ie(&pnetwork->network.ie_s[12], _HT_CAPABILITY_IE_,
			 &ht_ielen, pnetwork->network.IELength - 12);
@@ -236,7 +236,7 @@ static noinline_for_stack char *translate_scan(struct _adapter *padapter,
		iwe.u.data.flags = (u16)(IW_ENCODE_DISABLED);
	iwe.u.data.length = (u16)0;
	start = iwe_stream_add_point(info, start, stop, &iwe,
-		pnetwork->network.Ssid.Ssid);
+		pnetwork->network.ssid.ssid);
	/*Add basic and extended rates */
	current_val = start + iwe_stream_lcp_len(info);
	iwe.cmd = SIOCGIWRATE;
@@ -946,7 +946,7 @@ static int r871x_wx_set_priv(struct net_device *dev,
		/*static u8 xxxx; */
		if (check_fwstate(pmlmepriv, _FW_LINKED)) {
			sprintf(ext, "%s rssi %d",
-				pcur_network->network.Ssid.Ssid,
+				pcur_network->network.ssid.ssid,
				/*(xxxx=xxxx+10) */
				((padapter->recvpriv.fw_rssi) >> 1) - 95
				/*pcur_network->network.Rssi */

@@ -1163,8 +1163,8 @@ static int r8711_wx_set_scan(struct net_device *dev,

			memset((unsigned char *)&ssid, 0,
				 sizeof(struct ndis_802_11_ssid));
-			memcpy(ssid.Ssid, req->essid, len);
-			ssid.SsidLength = len;
+			memcpy(ssid.ssid, req->essid, len);
+			ssid.ssid_length = len;
			spin_lock_irqsave(&pmlmepriv->lock, irqL);
			if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY |
			     _FW_UNDER_LINKING)) ||
@@ -1264,9 +1264,9 @@ static int r8711_wx_set_essid(struct net_device *dev,
		len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ?
		       wrqu->essid.length : IW_ESSID_MAX_SIZE;
		memset(&ndis_ssid, 0, sizeof(struct ndis_802_11_ssid));

- ndis_ssid.SsidLength = len;
- memcpy(ndis_ssid.Ssid, extra, len);
- src_ssid = ndis_ssid.Ssid;
+ ndis_ssid.ssid_length = len;
+ memcpy(ndis_ssid.ssid, extra, len);

+		src_ssid = ndis_ssid.ssid;
		phead = &queue->queue;
		pmlmepriv->pscanned = phead->next;
		while (1) {
@@ -1275,10 +1275,10 @@ static int r8711_wx_set_essid(struct net_device *dev,
			pnetwork = container_of(pmlmepriv->pscanned,
						struct wlan_network, list);
			pmlmepriv->pscanned = pmlmepriv->pscanned->next;

- dst_ssid = pnetwork->network.Ssid.Ssid;
- if ((!memcmp(dst_ssid, src_ssid, ndis_ssid.SsidLength))
- && (pnetwork->network.Ssid.SsidLength ==
- ndis_ssid.SsidLength)) {
+ dst_ssid = pnetwork->network.ssid.ssid;
+ if ((!memcmp(dst_ssid, src_ssid, ndis_ssid.ssid_length))
+ && (pnetwork->network.ssid.ssid_length ==

+			     ndis_ssid.ssid_length)) {
				if (check_fwstate(pmlmepriv,
							WIFI_ADHOC_STATE)) {
					if (pnetwork->network.
@@ -1312,9 +1312,9 @@ static int r8711_wx_get_essid(struct net_device *dev,
	u32 len, ret = 0;

	if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE)) {
-		len = pcur_bss->Ssid.SsidLength;
+		len = pcur_bss->ssid.ssid_length;
		wrqu->essid.length = len;
-		memcpy(extra, pcur_bss->Ssid.Ssid, len);
+		memcpy(extra, pcur_bss->ssid.ssid, len);
		wrqu->essid.flags = 1;
	} else {
		ret = -ENOLINK;

index 01a1504..018fa43 100644
@@ -39,11 +39,11 @@ static u8 validate_ssid(struct ndis_802_11_ssid *ssid)
 {

	u8 i;

- if (ssid->SsidLength > 32)
+ if (ssid->ssid_length > 32)

		return false;
-	for (i = 0; i < ssid->SsidLength; i++) {
+	for (i = 0; i < ssid->ssid_length; i++) {
		/* wifi, printable ascii code must be supported */
-		if (!((ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e)))
+		if (!((ssid->ssid[i] >= 0x20) && (ssid->ssid[i] <= 0x7e)))
			return false;
	}
	return true;
@@ -92,7 +92,7 @@ static u8 do_join(struct _adapter *padapter)
				pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
				pibss = padapter->registrypriv.dev_network.
					MacAddress;
-				memcpy(&pdev_network->Ssid,
+				memcpy(&pdev_network->ssid,
					&pmlmepriv->assoc_ssid,
					sizeof(struct ndis_802_11_ssid));
				r8712_update_registrypriv_dev_network(padapter);
@@ -181,9 +181,9 @@ void r8712_set_802_11_ssid(struct _adapter *padapter,
		goto _Abort_Set_SSID;
	}
	if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE)) {

- if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) &&
- (!memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid,
- ssid->SsidLength))) {
+ if ((pmlmepriv->assoc_ssid.ssid_length == ssid->ssid_length) &&
+ (!memcmp(&pmlmepriv->assoc_ssid.ssid, ssid->ssid,

+		    ssid->ssid_length))) {
			if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
				if (!r8712_is_same_ibss(padapter,
				     pnetwork)) {

index 9d647c4..8fd32d8 100644
@@ -275,14 +275,14 @@ static int is_same_network(struct wlan_bssid_ex *src,
 

	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) &&
+	return (src->ssid.ssid_length == dst->ssid.ssid_length) &&
			(src->configuration.ds_config ==
			dst->configuration.ds_config) &&
			((!memcmp(src->MacAddress, dst->MacAddress,
			ETH_ALEN))) &&

- ((!memcmp(src->Ssid.Ssid,
- dst->Ssid.Ssid,
- src->Ssid.SsidLength))) &&
+ ((!memcmp(src->ssid.ssid,
+ dst->ssid.ssid,
+ src->ssid.ssid_length))) &&

			((s_cap & WLAN_CAPABILITY_IBSS) ==
			(d_cap & WLAN_CAPABILITY_IBSS)) &&
			((s_cap & WLAN_CAPABILITY_BSS) ==
@@ -543,11 +543,11 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
	}
	/* lock pmlmepriv->lock when you accessing network_q */
	if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
-		if (pnetwork->Ssid.Ssid[0] != 0) {
+		if (pnetwork->ssid.ssid[0] != 0) {
			rtl8711_add_network(adapter, pnetwork);
		} else {
-			pnetwork->Ssid.SsidLength = 8;
-			memcpy(pnetwork->Ssid.Ssid, "<hidden>", 8);
+			pnetwork->ssid.ssid_length = 8;
+			memcpy(pnetwork->ssid.ssid, "<hidden>", 8);
			rtl8711_add_network(adapter, pnetwork);
		}
	}
@@ -584,7 +584,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
						 adapter->registrypriv.
							dev_network.MacAddress;
					pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
-					memcpy(&pdev_network->Ssid,
+					memcpy(&pdev_network->ssid,
						&pmlmepriv->assoc_ssid,
						sizeof(struct
							 ndis_802_11_ssid));
@@ -987,7 +987,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf)
			memcpy(pdev_network, &tgt_network->network,
				r8712_get_wlan_bssid_ex_sz(&tgt_network->
							network));
-			memcpy(&pdev_network->Ssid,
+			memcpy(&pdev_network->ssid,
				&pmlmepriv->assoc_ssid,
				sizeof(struct ndis_802_11_ssid));
			r8712_update_registrypriv_dev_network(adapter);
@@ -1158,15 +1158,15 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv)
				}
				goto ask_for_joinbss;
			}
-		} else if (pmlmepriv->assoc_ssid.SsidLength == 0) {
+		} else if (pmlmepriv->assoc_ssid.ssid_length == 0) {
			goto ask_for_joinbss;
		}

- dst_ssid = pnetwork->network.Ssid.Ssid;
- src_ssid = pmlmepriv->assoc_ssid.Ssid;
- if ((pnetwork->network.Ssid.SsidLength ==
- pmlmepriv->assoc_ssid.SsidLength) &&
+ dst_ssid = pnetwork->network.ssid.ssid;
+ src_ssid = pmlmepriv->assoc_ssid.ssid;
+ if ((pnetwork->network.ssid.ssid_length ==
+ pmlmepriv->assoc_ssid.ssid_length) &&
(!memcmp(dst_ssid, src_ssid,
- pmlmepriv->assoc_ssid.SsidLength))) {

+		     pmlmepriv->assoc_ssid.ssid_length))) {
			if (pmlmepriv->assoc_by_rssi) {
				/* if the ssid is the same, select the bss
				 * which has the max rssi
@@ -1613,7 +1613,7 @@ void r8712_init_registrypriv_dev_network(struct _adapter *adapter)
	u8 *myhwaddr = myid(peepriv);

	memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
-	memcpy(&pdev_network->Ssid, &pregistrypriv->ssid,
+	memcpy(&pdev_network->ssid, &pregistrypriv->ssid,
		sizeof(struct ndis_802_11_ssid));
	pdev_network->configuration.Length =
			 sizeof(struct NDIS_802_11_CONFIGURATION);

index 6e264a8..4838e74 100644
@@ -169,9 +169,9 @@ static int mp_start_test(struct _adapter *padapter)
 

	/* 3 1. initialize a new struct wlan_bssid_ex */
	memcpy(bssid.MacAddress, pmppriv->network_macaddr, ETH_ALEN);

- bssid.Ssid.SsidLength = 16;
- memcpy(bssid.Ssid.Ssid, (unsigned char *)"mp_pseudo_adhoc",
- bssid.Ssid.SsidLength);
+ bssid.ssid.ssid_length = 16;
+ memcpy(bssid.ssid.ssid, (unsigned char *)"mp_pseudo_adhoc",

+		bssid.ssid.ssid_length);
	bssid.InfrastructureMode = Ndis802_11IBSS;
	bssid.NetworkTypeInUse = Ndis802_11DS;
	bssid.IELength = 0;

index 6354fc2..71d2df7 100644
@@ -33,8 +33,8 @@
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
 struct ndis_802_11_ssid {
-	u32 SsidLength;
-	u8  Ssid[32];
+	u32 ssid_length;
+	u8  ssid[32];
 };
 
 enum NDIS_802_11_NETWORK_TYPE {

@@ -82,7 +82,7 @@ struct wlan_bssid_ex {

	u32 Length;
	unsigned char  MacAddress[6];
	u8  Reserved[2];
-	struct ndis_802_11_ssid  Ssid;
+	struct ndis_802_11_ssid  ssid;
	__le32 privacy;
	s32 Rssi;
	enum NDIS_802_11_NETWORK_TYPE  NetworkTypeInUse;

--
1.9.1

Where are patches 1-8 of this series?

Where are patches 1-6 for this series?

Please fix and resend.

thanks,

greg k-h