This patch is created to solve the CamelCase issue. The members 'IEs' and
'IELength' of struct wlan_bssid_ex are being modified to 'ie' and
'ie_length' to solve the issue. And all the places where these variables
are referenced inside rtl8188eu driver are also changed.
Signed-off-by: Janani Sankara Babu <janani...@gmail.com>
---
Changes since V1:
* Removed the commented lines that was added by me
* Changed variable name from 'ies' to 'ie' as suggested
by Dan Carpenter<dan.carpen...@oracle.com>
drivers/staging/rtl8188eu/core/rtw_ap.c | 21 ++++------
drivers/staging/rtl8188eu/core/rtw_cmd.c | 14 +++----
drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 20 ++++-----
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_mlme.c | 24 +++++------
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 56 ++++++++++++-------------
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 26 ++++++------
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 8 ++--
drivers/staging/rtl8188eu/include/wlan_bssdef.h | 2 +-
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 10 ++---
10 files changed, 90 insertions(+), 93 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c
b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 2cd20f1..a52c856 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -69,15 +69,12 @@ static void update_BCNTIM(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;
- //unsigned char *pie = pnetwork_mlmeext->ies;
- unsigned char *pie = pnetwork_mlmeext->ies;
+ unsigned char *pie = pnetwork_mlmeext->ie;
u8 *p, *dst_ie, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
/* update TIM IE */
- //p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen,
- //pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen,
pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);
if (p && tim_ielen > 0) {
@@ -161,13 +158,13 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct
wlan_bssid_ex *pnetwork,
{
struct ndis_802_11_var_ie *pIE;
u8 bmatch = false;
- u8 *pie = pnetwork->ies;
+ u8 *pie = pnetwork->ie;
u8 *p = NULL, *dst_ie = NULL, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
u32 i, offset, ielen = 0, ie_offset, remainder_ielen = 0;
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->ie_length;)
{
- pIE = (struct ndis_802_11_var_ie *)(pnetwork->ies + i);
+ pIE = (struct ndis_802_11_var_ie *)(pnetwork->ie + i);
if (pIE->ElementID > index) {
break;
@@ -228,7 +225,7 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct
wlan_bssid_ex *pnetwork,
u8 *p, *dst_ie = NULL, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL;
uint offset, ielen, ie_offset, remainder_ielen = 0;
- u8 *pie = pnetwork->ies;
+ u8 *pie = pnetwork->ie;
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, index, &ielen,
pnetwork->ie_length - _FIXED_IE_LENGTH_);
@@ -743,7 +740,7 @@ static void start_bss_network(struct adapter *padapter, u8
*pbuf)
* beacon twice when stating hostapd, and at first time the
* security ie (RSN/WPA IE) will not include in beacon.
*/
- if (!rtw_get_wps_ie(pnetwork->ies + _FIXED_IE_LENGTH_,
pnetwork->ie_length - _FIXED_IE_LENGTH_, NULL, NULL))
+ if (!rtw_get_wps_ie(pnetwork->ie + _FIXED_IE_LENGTH_,
pnetwork->ie_length - _FIXED_IE_LENGTH_, NULL, NULL))
pmlmeext->bstart_bss = true;
/* todo: update wmm, ht cap */
@@ -797,7 +794,7 @@ static void start_bss_network(struct adapter *padapter, u8
*pbuf)
Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
}
/* set channel, bwmode */
- p = rtw_get_ie((pnetwork->ies + sizeof(struct ndis_802_11_fixed_ie)),
_HT_ADD_INFO_IE_, &ie_len, (pnetwork->ie_length - sizeof(struct
ndis_802_11_fixed_ie)));
+ p = rtw_get_ie((pnetwork->ie + sizeof(struct ndis_802_11_fixed_ie)),
_HT_ADD_INFO_IE_, &ie_len, (pnetwork->ie_length - sizeof(struct
ndis_802_11_fixed_ie)));
if (p && ie_len) {
pht_info = (struct HT_info_element *)(p + 2);
@@ -869,7 +866,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8
*pbuf, int len)
struct security_priv *psecuritypriv = &padapter->securitypriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pbss_network = (struct wlan_bssid_ex
*)&pmlmepriv->cur_network.network;
- u8 *ie = pbss_network->ies;
+ u8 *ie = pbss_network->ie;
/* SSID */
/* Supported rates */
@@ -1238,7 +1235,7 @@ static void update_bcn_erpinfo_ie(struct adapter
*padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;
- unsigned char *p, *ie = pnetwork->ies;
+ unsigned char *p, *ie = pnetwork->ie;
u32 len = 0;
DBG_88E("%s, ERP_enable =%d\n", __func__, pmlmeinfo->ERP_enable);
@@ -1275,7 +1272,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;
- unsigned char *ie = pnetwork->ies;
+ unsigned char *ie = pnetwork->ie;
u32 ielen = pnetwork->ie_length;
DBG_88E("%s\n", __func__);
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c
b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 9c6effa..77bf8e2 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -380,7 +380,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct
wlan_network *pnetwork)
res = _FAIL;
goto exit;
}
- /* for ies is fix buf size */
+ /* for ie is fix buf size */
t_len = sizeof(struct wlan_bssid_ex);
/* for hidden ap to set fw_state here */
@@ -418,9 +418,9 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct
wlan_network *pnetwork)
psecuritypriv->authenticator_ie[0] = (unsigned
char)psecnetwork->ie_length;
if ((psecnetwork->ie_length-12) < (256-1))
- memcpy(&psecuritypriv->authenticator_ie[1],
&psecnetwork->ies[12], psecnetwork->ie_length-12);
+ memcpy(&psecuritypriv->authenticator_ie[1],
&psecnetwork->ie[12], psecnetwork->ie_length-12);
else
- memcpy(&psecuritypriv->authenticator_ie[1],
&psecnetwork->ies[12], (256-1));
+ memcpy(&psecuritypriv->authenticator_ie[1],
&psecnetwork->ie[12], (256-1));
psecnetwork->ie_length = 0;
/* Added by Albert 2009/02/18 */
@@ -431,14 +431,14 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct
wlan_network *pnetwork)
if (!pmlmepriv->assoc_by_bssid)
memcpy(&pmlmepriv->assoc_bssid[0],
&pnetwork->network.MacAddress[0], ETH_ALEN);
- psecnetwork->ie_length = rtw_restruct_sec_ie(padapter,
&pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length);
+ psecnetwork->ie_length = rtw_restruct_sec_ie(padapter,
&pnetwork->network.ie[0], &psecnetwork->ie[0], pnetwork->network.ie_length);
pqospriv->qos_option = 0;
if (pregistrypriv->wmm_enable) {
u32 tmp_len;
- tmp_len = rtw_restruct_wmm_ie(padapter,
&pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length,
psecnetwork->ie_length);
+ tmp_len = rtw_restruct_wmm_ie(padapter,
&pnetwork->network.ie[0], &psecnetwork->ie[0], pnetwork->network.ie_length,
psecnetwork->ie_length);
if (psecnetwork->ie_length != tmp_len) {
psecnetwork->ie_length = tmp_len;
@@ -460,12 +460,12 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct
wlan_network *pnetwork)
(padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_) &&
(padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {
/* rtw_restructure_ht_ie */
- rtw_restructure_ht_ie(padapter,
&pnetwork->network.ies[0], &psecnetwork->ies[0],
+ rtw_restructure_ht_ie(padapter,
&pnetwork->network.ie[0], &psecnetwork->ie[0],
pnetwork->network.ie_length, &psecnetwork->ie_length);
}
}
- pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.ies,
pnetwork->network.ie_length);
+ pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->network.ie,
pnetwork->network.ie_length);
if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_TENDA)
padapter->pwrctrlpriv.smart_ps = 0;
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index f11ab70..cc78bbc 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -229,7 +229,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
int rateLen;
uint sz = 0;
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
- u8 *ie = pdev_network->ies;
+ u8 *ie = pdev_network->ie;
/* timestamp will be inserted by hardware */
@@ -590,8 +590,8 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen)
}
/**
- * rtw_get_wps_ie - Search WPS IE from a series of ies
- * @in_ie: Address of ies to search
+ * rtw_get_wps_ie - Search WPS IE from a series of ie
+ * @in_ie: Address of ie to search
* @in_len: Length limit from in_ie
* @wps_ie: If not NULL and WPS IE is found, WPS IE will be copied to the buf
starting from wps_ie
* @wps_ielen: If not NULL and WPS IE is found, will set to the length of the
entire WPS IE
@@ -798,7 +798,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos,
uint elen,
/**
* ieee802_11_parse_elems - Parse information elements in management frames
- * @start: Pointer to the start of ies
+ * @start: Pointer to the start of ie
* @len: Length of IE buffer in octets
* @elems: Data structure for parsed elements
* @show_errors: Whether to show parsing errors in debug log
@@ -962,7 +962,7 @@ static int rtw_get_cipher_info(struct wlan_network
*pnetwork)
int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;
int ret = _FAIL;
- pbuf = rtw_get_wpa_ie(&pnetwork->network.ies[12], &wpa_ielen,
pnetwork->network.ie_length - 12);
+ pbuf = rtw_get_wpa_ie(&pnetwork->network.ie[12], &wpa_ielen,
pnetwork->network.ie_length - 12);
if (pbuf && (wpa_ielen > 0)) {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
("rtw_get_cipher_info: wpa_ielen: %d", wpa_ielen));
@@ -975,7 +975,7 @@ static int rtw_get_cipher_info(struct wlan_network
*pnetwork)
ret = _SUCCESS;
}
} else {
- pbuf = rtw_get_wpa2_ie(&pnetwork->network.ies[12], &wpa_ielen,
pnetwork->network.ie_length - 12);
+ pbuf = rtw_get_wpa2_ie(&pnetwork->network.ie[12], &wpa_ielen,
pnetwork->network.ie_length - 12);
if (pbuf && (wpa_ielen > 0)) {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("get RSN
IE\n"));
@@ -1005,7 +1005,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
uint len;
unsigned char *p;
- memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.ies), 2);
+ memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.ie), 2);
cap = le16_to_cpu(le_tmp);
if (cap & WLAN_CAPABILITY_PRIVACY) {
bencrypt = 1;
@@ -1013,7 +1013,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
} else {
pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;
}
- rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length,
NULL, &rsn_len, NULL, &wpa_len);
+ rtw_get_sec_ie(pnetwork->network.ie, pnetwork->network.ie_length, NULL,
&rsn_len, NULL, &wpa_len);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid
=%s\n", pnetwork->network.Ssid.Ssid));
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info:
wpa_len =%d rsn_len =%d\n", wpa_len, rsn_len));
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid
=%s\n", pnetwork->network.Ssid.Ssid));
@@ -1035,7 +1035,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
/* get bwmode and ch_offset */
/* parsing HT_CAP_IE */
- p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_,
_HT_CAPABILITY_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(pnetwork->network.ie + _FIXED_IE_LENGTH_,
_HT_CAPABILITY_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
if (p && len > 0) {
struct ieee80211_ht_cap *ht_cap =
(struct ieee80211_ht_cap *)(p + 2);
@@ -1045,7 +1045,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
pnetwork->BcnInfo.ht_cap_info = 0;
}
/* parsing HT_INFO_IE */
- p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_,
_HT_ADD_INFO_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(pnetwork->network.ie + _FIXED_IE_LENGTH_,
_HT_ADD_INFO_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
if (p && len > 0) {
pht_info = (struct HT_info_element *)(p + 2);
pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0];
diff --git a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
b/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
index 92c313e..9c4d41f 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
@@ -577,7 +577,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
return 0;
if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N|WIRELESS_11_5N)) {
- p = rtw_get_ie(&pcur_bss->ies[12], _HT_CAPABILITY_IE_,
&ht_ielen, pcur_bss->ie_length-12);
+ p = rtw_get_ie(&pcur_bss->ie[12], _HT_CAPABILITY_IE_,
&ht_ielen, pcur_bss->ie_length-12);
if (p && ht_ielen > 0) {
/* cur_bwmod is updated by beacon, pmlmeinfo is updated
by association response */
bw_40MHz = (pmlmeext->cur_bwmode &&
(HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0])) ? 1 : 0;
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c
b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index 921b6a6..d3668ca 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -270,7 +270,7 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss)
{
__le16 val;
- memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->ies), 2);
+ memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->ie), 2);
return le16_to_cpu(val);
}
@@ -318,8 +318,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct
wlan_bssid_ex *dst)
u16 s_cap, d_cap;
__le16 le_scap, le_dcap;
- memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->ies), 2);
- memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->ies), 2);
+ memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->ie), 2);
+ memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->ie), 2);
s_cap = le16_to_cpu(le_scap);
d_cap = le16_to_cpu(le_dcap);
@@ -399,7 +399,7 @@ static void update_current_network(struct adapter *adapter,
struct wlan_bssid_ex
if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) &&
(is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) {
update_network(&(pmlmepriv->cur_network.network), pnetwork,
adapter, true);
- rtw_update_protection(adapter,
(pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fixed_ie),
+ rtw_update_protection(adapter,
(pmlmepriv->cur_network.network.ie) + sizeof(struct ndis_802_11_fixed_ie),
pmlmepriv->cur_network.network.ie_length);
}
}
@@ -524,7 +524,7 @@ static int rtw_is_desired_network(struct adapter *adapter,
struct wlan_network *
privacy = pnetwork->network.Privacy;
if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) {
- if (rtw_get_wps_ie(pnetwork->network.ies+_FIXED_IE_LENGTH_,
pnetwork->network.ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen))
+ if (rtw_get_wps_ie(pnetwork->network.ie+_FIXED_IE_LENGTH_,
pnetwork->network.ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen))
return true;
else
return false;
@@ -576,11 +576,11 @@ void rtw_survey_event_callback(struct adapter
*adapter, u8 *pbuf)
if (!memcmp(&(pmlmepriv->cur_network.network.MacAddress),
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, pnetwork->ie,
8);
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue,
pnetwork->MacAddress);
if (ibss_wlan) {
- memcpy(ibss_wlan->network.ies, pnetwork->ies,
8);
+ memcpy(ibss_wlan->network.ie, pnetwork->ie, 8);
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
goto exit;
}
@@ -947,9 +947,9 @@ static void rtw_joinbss_update_network(struct adapter
*padapter, struct wlan_net
/* why not use ptarget_wlan?? */
memcpy(&cur_network->network, &pnetwork->network,
pnetwork->network.Length);
- /* some ies in pnetwork is wrong, so we should use ptarget_wlan ies */
+ /* some ie in pnetwork is wrong, so we should use ptarget_wlan ie */
cur_network->network.ie_length = ptarget_wlan->network.ie_length;
- memcpy(&cur_network->network.ies[0], &ptarget_wlan->network.ies[0],
MAX_IE_SZ);
+ memcpy(&cur_network->network.ie[0], &ptarget_wlan->network.ie[0],
MAX_IE_SZ);
cur_network->aid = pnetwork->join_res;
@@ -977,10 +977,10 @@ static void rtw_joinbss_update_network(struct adapter
*padapter, struct wlan_net
break;
}
- rtw_update_protection(padapter, (cur_network->network.ies) +
+ rtw_update_protection(padapter, (cur_network->network.ie) +
sizeof(struct ndis_802_11_fixed_ie),
(cur_network->network.ie_length));
- rtw_update_ht_cap(padapter, cur_network->network.ies,
cur_network->network.ie_length);
+ rtw_update_ht_cap(padapter, cur_network->network.ie,
cur_network->network.ie_length);
}
/* Notes: the function could be > passive_level (the same context as Rx
tasklet) */
@@ -1665,7 +1665,7 @@ int rtw_set_key(struct adapter *adapter, struct
security_priv *psecuritypriv, in
return res;
}
-/* adjust ies for rtw_joinbss_cmd in WMM */
+/* adjust ie for rtw_joinbss_cmd in WMM */
int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint
in_len, uint initial_out_len)
{
unsigned int ie_length = 0;
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 9273acf..c3b43c9 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -371,7 +371,7 @@ static void issue_beacon(struct adapter *padapter, int
timeout_ms)
uint wps_ielen;
u8 sr = 0;
- memcpy(pframe, cur_network->ies, cur_network->ie_length);
+ memcpy(pframe, cur_network->ie, cur_network->ie_length);
len_diff = update_hidden_ssid(
pframe+_BEACON_IE_OFFSET_
, cur_network->ie_length-_BEACON_IE_OFFSET_
@@ -399,14 +399,14 @@ static void issue_beacon(struct adapter *padapter, int
timeout_ms)
/* beacon interval: 2 bytes */
- memcpy(pframe, (unsigned char
*)(rtw_get_beacon_interval_from_ie(cur_network->ies)), 2);
+ memcpy(pframe, (unsigned char
*)(rtw_get_beacon_interval_from_ie(cur_network->ie)), 2);
pframe += 2;
pattrib->pktlen += 2;
/* capability info: 2 bytes */
- memcpy(pframe, (unsigned char
*)(rtw_get_capability_from_ie(cur_network->ies)), 2);
+ memcpy(pframe, (unsigned char
*)(rtw_get_capability_from_ie(cur_network->ie)), 2);
pframe += 2;
pattrib->pktlen += 2;
@@ -514,20 +514,20 @@ static void issue_probersp(struct adapter *padapter,
unsigned char *da)
#if defined(CONFIG_88EU_AP_MODE)
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
- pwps_ie = rtw_get_wps_ie(cur_network->ies+_FIXED_IE_LENGTH_,
cur_network->ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
+ pwps_ie = rtw_get_wps_ie(cur_network->ie+_FIXED_IE_LENGTH_,
cur_network->ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
/* inerset & update wps_probe_resp_ie */
if ((pmlmepriv->wps_probe_resp_ie != NULL) && pwps_ie &&
(wps_ielen > 0)) {
uint wps_offset, remainder_ielen;
u8 *premainder_ie;
- wps_offset = (uint)(pwps_ie - cur_network->ies);
+ wps_offset = (uint)(pwps_ie - cur_network->ie);
premainder_ie = pwps_ie + wps_ielen;
remainder_ielen = cur_network->ie_length - wps_offset -
wps_ielen;
- memcpy(pframe, cur_network->ies, wps_offset);
+ memcpy(pframe, cur_network->ie, wps_offset);
pframe += wps_offset;
pattrib->pktlen += wps_offset;
@@ -544,7 +544,7 @@ static void issue_probersp(struct adapter *padapter,
unsigned char *da)
pattrib->pktlen += remainder_ielen;
}
} else {
- memcpy(pframe, cur_network->ies,
cur_network->ie_length);
+ memcpy(pframe, cur_network->ie, cur_network->ie_length);
pframe += cur_network->ie_length;
pattrib->pktlen += cur_network->ie_length;
}
@@ -557,14 +557,14 @@ static void issue_probersp(struct adapter *padapter,
unsigned char *da)
/* beacon interval: 2 bytes */
- memcpy(pframe, (unsigned char
*)(rtw_get_beacon_interval_from_ie(cur_network->ies)), 2);
+ memcpy(pframe, (unsigned char
*)(rtw_get_beacon_interval_from_ie(cur_network->ie)), 2);
pframe += 2;
pattrib->pktlen += 2;
/* capability info: 2 bytes */
- memcpy(pframe, (unsigned char
*)(rtw_get_capability_from_ie(cur_network->ies)), 2);
+ memcpy(pframe, (unsigned char
*)(rtw_get_capability_from_ie(cur_network->ie)), 2);
pframe += 2;
pattrib->pktlen += 2;
@@ -904,7 +904,7 @@ static void issue_asocrsp(struct adapter *padapter,
unsigned short status,
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
- u8 *ie = pnetwork->ies;
+ u8 *ie = pnetwork->ie;
__le16 lestatus, leval;
DBG_88E("%s\n", __func__);
@@ -1063,7 +1063,7 @@ static void issue_assocreq(struct adapter *padapter)
/* caps */
- memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.ies), 2);
+ memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.ie), 2);
pframe += 2;
pattrib->pktlen += 2;
@@ -1130,13 +1130,13 @@ static void issue_assocreq(struct adapter *padapter)
}
/* RSN */
- p = rtw_get_ie((pmlmeinfo->network.ies + sizeof(struct
ndis_802_11_fixed_ie)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.ie_length -
sizeof(struct ndis_802_11_fixed_ie)));
+ p = rtw_get_ie((pmlmeinfo->network.ie + sizeof(struct
ndis_802_11_fixed_ie)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.ie_length -
sizeof(struct ndis_802_11_fixed_ie)));
if (p != NULL)
pframe = rtw_set_ie(pframe, _RSN_IE_2_, ie_len, (p + 2),
&(pattrib->pktlen));
/* HT caps */
if (padapter->mlmepriv.htpriv.ht_option) {
- p = rtw_get_ie((pmlmeinfo->network.ies + sizeof(struct
ndis_802_11_fixed_ie)), _HT_CAPABILITY_IE_, &ie_len,
(pmlmeinfo->network.ie_length - sizeof(struct ndis_802_11_fixed_ie)));
+ p = rtw_get_ie((pmlmeinfo->network.ie + sizeof(struct
ndis_802_11_fixed_ie)), _HT_CAPABILITY_IE_, &ie_len,
(pmlmeinfo->network.ie_length - sizeof(struct ndis_802_11_fixed_ie)));
if ((p != NULL) && (!(is_ap_in_tkip(padapter)))) {
memcpy(&pmlmeinfo->HT_caps, p + 2, sizeof(struct
ieee80211_ht_cap));
@@ -1158,7 +1158,7 @@ static void issue_assocreq(struct adapter *padapter)
/* vendor specific IE, such as WPA, WMM, WPS */
for (i = sizeof(struct ndis_802_11_fixed_ie); i <
pmlmeinfo->network.ie_length; i += (pIE->Length + 2)) {
- pIE = (struct ndis_802_11_var_ie *)(pmlmeinfo->network.ies + i);
+ pIE = (struct ndis_802_11_var_ie *)(pmlmeinfo->network.ie + i);
switch (pIE->ElementID) {
case _VENDOR_SPECIFIC_IE_:
@@ -1796,7 +1796,7 @@ static void issue_action_BSSCoexistPacket(struct adapter
*padapter)
pbss_network = (struct wlan_bssid_ex
*)&pnetwork->network;
- p = rtw_get_ie(pbss_network->ies + _FIXED_IE_LENGTH_,
_HT_CAPABILITY_IE_, &len, pbss_network->ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(pbss_network->ie + _FIXED_IE_LENGTH_,
_HT_CAPABILITY_IE_, &len, pbss_network->ie_length - _FIXED_IE_LENGTH_);
if ((p == NULL) || (len == 0)) { /* non-HT */
if ((pbss_network->Configuration.DSConfig <= 0)
|| (pbss_network->Configuration.DSConfig > 14))
continue;
@@ -2073,7 +2073,7 @@ static u8 collect_bss_info(struct adapter *padapter,
/* below is to copy the information element */
bssid->ie_length = len;
- memcpy(bssid->ies, (pframe + sizeof(struct ieee80211_hdr_3addr)),
bssid->ie_length);
+ memcpy(bssid->ie, (pframe + sizeof(struct ieee80211_hdr_3addr)),
bssid->ie_length);
/* get the signal strength in dBM.raw data */
bssid->Rssi = precv_frame->attrib.phy_info.recvpower;
@@ -2082,7 +2082,7 @@ static u8 collect_bss_info(struct adapter *padapter,
rtw_hal_get_def_var(padapter, HAL_DEF_CURRENT_ANTENNA,
&bssid->PhyInfo.Optimum_antenna);
/* checking SSID */
- p = rtw_get_ie(bssid->ies + ie_offset, _SSID_IE_, &len,
bssid->ie_length - ie_offset);
+ p = rtw_get_ie(bssid->ie + ie_offset, _SSID_IE_, &len, bssid->ie_length
- ie_offset);
if (p == NULL) {
DBG_88E("marc: cannot find SSID for survey event\n");
return _FAIL;
@@ -2103,7 +2103,7 @@ static u8 collect_bss_info(struct adapter *padapter,
/* checking rate info... */
i = 0;
- p = rtw_get_ie(bssid->ies + ie_offset, _SUPPORTEDRATES_IE_, &len,
bssid->ie_length - ie_offset);
+ p = rtw_get_ie(bssid->ie + ie_offset, _SUPPORTEDRATES_IE_, &len,
bssid->ie_length - ie_offset);
if (p != NULL) {
if (len > NDIS_802_11_LENGTH_RATES_EX) {
DBG_88E("%s()-%d: IE too long (%d) for survey event\n",
__func__, __LINE__, len);
@@ -2113,7 +2113,7 @@ static u8 collect_bss_info(struct adapter *padapter,
i = len;
}
- p = rtw_get_ie(bssid->ies + ie_offset, _EXT_SUPPORTEDRATES_IE_, &len,
bssid->ie_length - ie_offset);
+ p = rtw_get_ie(bssid->ie + ie_offset, _EXT_SUPPORTEDRATES_IE_, &len,
bssid->ie_length - ie_offset);
if (p != NULL) {
if (len > (NDIS_802_11_LENGTH_RATES_EX-i)) {
DBG_88E("%s()-%d: IE too long (%d) for survey event\n",
__func__, __LINE__, len);
@@ -2129,7 +2129,7 @@ static u8 collect_bss_info(struct adapter *padapter,
return _FAIL;
/* Checking for DSConfig */
- p = rtw_get_ie(bssid->ies + ie_offset, _DSSET_IE_, &len,
bssid->ie_length - ie_offset);
+ p = rtw_get_ie(bssid->ie + ie_offset, _DSSET_IE_, &len,
bssid->ie_length - ie_offset);
bssid->Configuration.DSConfig = 0;
bssid->Configuration.Length = 0;
@@ -2138,7 +2138,7 @@ static u8 collect_bss_info(struct adapter *padapter,
bssid->Configuration.DSConfig = *(p + 2);
} else {/* In 5G, some ap do not have DSSET IE */
/* checking HT info for channel */
- p = rtw_get_ie(bssid->ies + ie_offset, _HT_ADD_INFO_IE_, &len,
bssid->ie_length - ie_offset);
+ p = rtw_get_ie(bssid->ie + ie_offset, _HT_ADD_INFO_IE_, &len,
bssid->ie_length - ie_offset);
if (p) {
struct HT_info_element *HT_info = (struct
HT_info_element *)(p + 2);
@@ -2157,7 +2157,7 @@ static u8 collect_bss_info(struct adapter *padapter,
}
bssid->Configuration.BeaconPeriod =
- get_unaligned_le16(rtw_get_beacon_interval_from_ie(bssid->ies));
+ get_unaligned_le16(rtw_get_beacon_interval_from_ie(bssid->ie));
val16 = rtw_get_capability((struct wlan_bssid_ex *)bssid);
@@ -2180,7 +2180,7 @@ static u8 collect_bss_info(struct adapter *padapter,
if ((pregistrypriv->wifi_spec == 1) && (!pmlmeinfo->bwmode_updated)) {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- p = rtw_get_ie(bssid->ies + ie_offset, _HT_CAPABILITY_IE_,
&len, bssid->ie_length - ie_offset);
+ p = rtw_get_ie(bssid->ie + ie_offset, _HT_CAPABILITY_IE_, &len,
bssid->ie_length - ie_offset);
if (p && len > 0) {
struct ieee80211_ht_cap *pHT_caps =
(struct ieee80211_ht_cap *)(p + 2);
@@ -2400,7 +2400,7 @@ static void process_80211d(struct adapter *padapter,
struct wlan_bssid_ex *bssid
u8 noc; /* number of channel */
u8 j, k;
- ie = rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, _COUNTRY_IE_,
&len, bssid->ie_length - _FIXED_IE_LENGTH_);
+ ie = rtw_get_ie(bssid->ie + _FIXED_IE_LENGTH_, _COUNTRY_IE_,
&len, bssid->ie_length - _FIXED_IE_LENGTH_);
if (!ie)
return;
if (len < 6)
@@ -4957,7 +4957,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
if (pnetwork->ie_length > MAX_IE_SZ)/* Check pbuf->ie_length */
return H2C_PARAMETERS_ERROR;
- memcpy(pnetwork->ies, ((struct wlan_bssid_ex *)pbuf)->ies,
pnetwork->ie_length);
+ memcpy(pnetwork->ie, ((struct wlan_bssid_ex *)pbuf)->ie,
pnetwork->ie_length);
start_create_ibss(padapter);
}
@@ -5016,12 +5016,12 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
if (pnetwork->ie_length > MAX_IE_SZ)/* Check pbuf->ie_length */
return H2C_PARAMETERS_ERROR;
- memcpy(pnetwork->ies, ((struct wlan_bssid_ex *)pbuf)->ies,
pnetwork->ie_length);
+ memcpy(pnetwork->ie, ((struct wlan_bssid_ex *)pbuf)->ie,
pnetwork->ie_length);
/* Check AP vendor to move rtw_joinbss_cmd() */
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->ie_length;)
{
- pIE = (struct ndis_802_11_var_ie *)(pnetwork->ies + i);
+ pIE = (struct ndis_802_11_var_ie *)(pnetwork->ie + i);
switch (pIE->ElementID) {
case _VENDOR_SPECIFIC_IE_:/* Get WMM IE. */
@@ -5388,7 +5388,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
goto exit;
}
- len_diff = update_hidden_ssid(ptxBeacon_parm->ies+_BEACON_IE_OFFSET_,
+ len_diff = update_hidden_ssid(ptxBeacon_parm->ie+_BEACON_IE_OFFSET_,
ptxBeacon_parm->ie_length-_BEACON_IE_OFFSET_,
pmlmeinfo->hidden_ssid_mode);
ptxBeacon_parm->ie_length += len_diff;
diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 70e7a07..0267372a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -380,7 +380,7 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss)
{
__le16 val;
- memcpy((unsigned char *)&val,
rtw_get_beacon_interval_from_ie(bss->ies), 2);
+ memcpy((unsigned char *)&val, rtw_get_beacon_interval_from_ie(bss->ie),
2);
return le16_to_cpu(val);
}
@@ -898,11 +898,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
/* below is to copy the information element */
bssid->ie_length = len;
- memcpy(bssid->ies, (pframe + sizeof(struct ieee80211_hdr_3addr)),
bssid->ie_length);
+ memcpy(bssid->ie, (pframe + sizeof(struct ieee80211_hdr_3addr)),
bssid->ie_length);
/* check bw and channel offset */
/* parsing HT_CAP_IE */
- p = rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_,
&len, bssid->ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(bssid->ie + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
if (p && len > 0) {
struct ieee80211_ht_cap *ht_cap =
(struct ieee80211_ht_cap *)(p + 2);
@@ -912,7 +912,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
ht_cap_info = 0;
}
/* parsing HT_INFO_IE */
- p = rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(bssid->ie + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
if (p && len > 0) {
pht_info = (struct HT_info_element *)(p + 2);
ht_info_infos_0 = pht_info->infos[0];
@@ -934,11 +934,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
}
/* Checking for channel */
- p = rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, _DSSET_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(bssid->ie + _FIXED_IE_LENGTH_, _DSSET_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
if (p) {
bcn_channel = *(p + 2);
} else {/* In 5G, some ap do not have DSSET IE checking HT info for
channel */
- p = rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_,
_HT_ADD_INFO_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(bssid->ie + _FIXED_IE_LENGTH_,
_HT_ADD_INFO_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_);
if (pht_info) {
bcn_channel = pht_info->primary_channel;
} else { /* we don't find channel IE, so don't check it
*/
@@ -954,7 +954,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
/* checking SSID */
ssid_len = 0;
- p = rtw_get_ie(bssid->ies + _FIXED_IE_LENGTH_, _SSID_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(bssid->ie + _FIXED_IE_LENGTH_, _SSID_IE_, &len,
bssid->ie_length - _FIXED_IE_LENGTH_);
if (p) {
ssid_len = *(p + 1);
if (ssid_len > NDIS_802_11_LENGTH_SSID)
@@ -992,7 +992,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
goto _mismatch;
}
- rtw_get_sec_ie(bssid->ies, bssid->ie_length, NULL, &rsn_len, NULL,
&wpa_len);
+ rtw_get_sec_ie(bssid->ie, bssid->ie_length, NULL, &rsn_len, NULL,
&wpa_len);
if (rsn_len > 0) {
encryp_protocol = ENCRYP_PROTOCOL_WPA2;
@@ -1009,7 +1009,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
}
if (encryp_protocol == ENCRYP_PROTOCOL_WPA || encryp_protocol ==
ENCRYP_PROTOCOL_WPA2) {
- pbuf = rtw_get_wpa_ie(&bssid->ies[12], &wpa_ielen,
bssid->ie_length-12);
+ pbuf = rtw_get_wpa_ie(&bssid->ie[12], &wpa_ielen,
bssid->ie_length-12);
if (pbuf && (wpa_ielen > 0)) {
if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2,
&group_cipher, &pairwise_cipher, &is_8021x)) {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
@@ -1017,7 +1017,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8
*pframe, u32 packet_len)
pairwise_cipher, group_cipher,
is_8021x));
}
} else {
- pbuf = rtw_get_wpa2_ie(&bssid->ies[12], &wpa_ielen,
bssid->ie_length-12);
+ pbuf = rtw_get_wpa2_ie(&bssid->ie[12], &wpa_ielen,
bssid->ie_length-12);
if (pbuf && (wpa_ielen > 0)) {
if (_SUCCESS == rtw_parse_wpa2_ie(pbuf,
wpa_ielen+2, &group_cipher, &pairwise_cipher, &is_8021x)) {
@@ -1089,7 +1089,7 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
if (rtw_get_capability((struct wlan_bssid_ex *)cur_network) &
WLAN_CAPABILITY_PRIVACY) {
for (i = sizeof(struct ndis_802_11_fixed_ie); i <
pmlmeinfo->network.ie_length;) {
- pIE = (struct ndis_802_11_var_ie
*)(pmlmeinfo->network.ies + i);
+ pIE = (struct ndis_802_11_var_ie
*)(pmlmeinfo->network.ie + i);
switch (pIE->ElementID) {
case _VENDOR_SPECIFIC_IE_:
@@ -1120,7 +1120,7 @@ unsigned int should_forbid_n_rate(struct adapter
*padapter)
if (rtw_get_capability((struct wlan_bssid_ex *)cur_network) &
WLAN_CAPABILITY_PRIVACY) {
for (i = sizeof(struct ndis_802_11_fixed_ie); i <
cur_network->ie_length;) {
- pIE = (struct ndis_802_11_var_ie *)(cur_network->ies +
i);
+ pIE = (struct ndis_802_11_var_ie *)(cur_network->ie +
i);
switch (pIE->ElementID) {
case _VENDOR_SPECIFIC_IE_:
@@ -1156,7 +1156,7 @@ unsigned int is_ap_in_wep(struct adapter *padapter)
if (rtw_get_capability((struct wlan_bssid_ex *)cur_network) &
WLAN_CAPABILITY_PRIVACY) {
for (i = sizeof(struct ndis_802_11_fixed_ie); i <
pmlmeinfo->network.ie_length;) {
- pIE = (struct ndis_802_11_var_ie
*)(pmlmeinfo->network.ies + i);
+ pIE = (struct ndis_802_11_var_ie
*)(pmlmeinfo->network.ie + i);
switch (pIE->ElementID) {
case _VENDOR_SPECIFIC_IE_:
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index 60b6bf0..22cd6e3 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -248,20 +248,20 @@ static void ConstructBeacon(struct adapter *adapt, u8
*pframe, u32 *pLength)
pktlen += 8;
/* beacon interval: 2 bytes */
- memcpy(pframe, (unsigned char
*)(rtw_get_beacon_interval_from_ie(cur_network->ies)), 2);
+ memcpy(pframe, (unsigned char
*)(rtw_get_beacon_interval_from_ie(cur_network->ie)), 2);
pframe += 2;
pktlen += 2;
/* capability info: 2 bytes */
- memcpy(pframe, (unsigned char
*)(rtw_get_capability_from_ie(cur_network->ies)), 2);
+ memcpy(pframe, (unsigned char
*)(rtw_get_capability_from_ie(cur_network->ie)), 2);
pframe += 2;
pktlen += 2;
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
pktlen += cur_network->ie_length - sizeof(struct
ndis_802_11_fixed_ie);
- memcpy(pframe, cur_network->ies+sizeof(struct
ndis_802_11_fixed_ie), pktlen);
+ memcpy(pframe, cur_network->ie+sizeof(struct
ndis_802_11_fixed_ie), pktlen);
goto _ConstructBeacon;
}
@@ -427,7 +427,7 @@ static void ConstructProbeRsp(struct adapter *adapt, u8
*pframe, u32 *pLength, u
if (cur_network->ie_length > MAX_IE_SZ)
return;
- memcpy(pframe, cur_network->ies, cur_network->ie_length);
+ memcpy(pframe, cur_network->ie, cur_network->ie_length);
pframe += cur_network->ie_length;
pktlen += cur_network->ie_length;
diff --git a/drivers/staging/rtl8188eu/include/wlan_bssdef.h
b/drivers/staging/rtl8188eu/include/wlan_bssdef.h
index 8fc5a84..f424b7a 100644
--- a/drivers/staging/rtl8188eu/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8188eu/include/wlan_bssdef.h
@@ -193,7 +193,7 @@ struct wlan_bssid_ex {
unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
struct wlan_phy_info PhyInfo;
u32 ie_length;
- u8 ies[MAX_IE_SZ]; /* timestamp, beacon interval, and
+ u8 ie[MAX_IE_SZ]; /* timestamp, beacon interval, and
* capability information) */
} __packed;
diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 5e7f2af..e805551 100644
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -129,7 +129,7 @@ static char *translate_scan(struct adapter *padapter,
start = iwe_stream_add_point(info, start, stop, &iwe,
pnetwork->network.Ssid.Ssid);
/* parsing HT_CAP_IE */
- p = rtw_get_ie(&pnetwork->network.ies[12], _HT_CAPABILITY_IE_,
&ht_ielen, pnetwork->network.ie_length-12);
+ p = rtw_get_ie(&pnetwork->network.ie[12], _HT_CAPABILITY_IE_,
&ht_ielen, pnetwork->network.ie_length-12);
if (p && ht_ielen > 0) {
struct ieee80211_ht_cap *pht_capie;
@@ -174,7 +174,7 @@ static char *translate_scan(struct adapter *padapter,
/* Add mode */
iwe.cmd = SIOCGIWMODE;
- memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.ies), 2);
+ memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.ie), 2);
cap = le16_to_cpu(le_tmp);
@@ -243,7 +243,7 @@ static char *translate_scan(struct adapter *padapter,
u16 wpa_len = 0, rsn_len = 0;
u8 *p;
- rtw_get_sec_ie(pnetwork->network.ies,
pnetwork->network.ie_length, rsn_ie, &rsn_len, wpa_ie, &wpa_len);
+ rtw_get_sec_ie(pnetwork->network.ie,
pnetwork->network.ie_length, rsn_ie, &rsn_len, wpa_ie, &wpa_len);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
("rtw_wx_get_scan: ssid =%s\n", pnetwork->network.Ssid.Ssid));
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
("rtw_wx_get_scan: wpa_len =%d rsn_len =%d\n", wpa_len, rsn_len));
@@ -286,7 +286,7 @@ static char *translate_scan(struct adapter *padapter,
uint cnt = 0, total_ielen;
u8 *wpsie_ptr = NULL;
uint wps_ielen = 0;
- u8 *ie_ptr = pnetwork->network.ies + _FIXED_IE_LENGTH_;
+ u8 *ie_ptr = pnetwork->network.ie + _FIXED_IE_LENGTH_;
total_ielen = pnetwork->network.ie_length - _FIXED_IE_LENGTH_;
@@ -644,7 +644,7 @@ static int rtw_wx_get_name(struct net_device *dev,
if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) ==
true) {
/* parsing HT_CAP_IE */
- p = rtw_get_ie(&pcur_bss->ies[12], _HT_CAPABILITY_IE_,
&ht_ielen, pcur_bss->ie_length-12);
+ p = rtw_get_ie(&pcur_bss->ie[12], _HT_CAPABILITY_IE_,
&ht_ielen, pcur_bss->ie_length-12);
if (p && ht_ielen > 0)
ht_cap = true;
--
1.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
