evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8723au: Remove unnecessary typecasts of struct wlan_bssid_ex objects

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-26 18:55:09 +02:00 • committed by Greg Kroah-Hartman
parent aab26454e9
commit 520179558a
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/rtl8723au/core/rtw_ap.c
View file

@ -361,7 +361,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct sta_info *psta, u8 rssi_l
unsigned int tx_ra_bitmap = 0; unsigned int tx_ra_bitmap = 0;
struct ht_priv *psta_ht = NULL; struct ht_priv *psta_ht = NULL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network; struct wlan_bssid_ex *pcur_network = &pmlmepriv->cur_network.network;
if (psta) if (psta)
psta_ht = &psta->htpriv; psta_ht = &psta->htpriv;
@ -459,7 +459,7 @@ static void update_bmc_sta(struct rtw_adapter *padapter)
int i, supportRateNum = 0; int i, supportRateNum = 0;
unsigned int tx_ra_bitmap = 0; unsigned int tx_ra_bitmap = 0;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network; struct wlan_bssid_ex *pcur_network = &pmlmepriv->cur_network.network;
struct sta_info *psta = rtw_get_bcmc_stainfo23a(padapter); struct sta_info *psta = rtw_get_bcmc_stainfo23a(padapter);
if (psta) if (psta)
@ -652,7 +652,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv* psecuritypriv = &padapter->securitypriv; struct security_priv* psecuritypriv = &padapter->securitypriv;
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network; struct wlan_bssid_ex *pnetwork = &pmlmepriv->cur_network.network;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network; struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;
@ -766,7 +766,7 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf)
update_wireless_mode23a(padapter); update_wireless_mode23a(padapter);
/* udpate capability after cur_wireless_mode updated */ /* udpate capability after cur_wireless_mode updated */
update_capinfo23a(padapter, rtw_get_capability23a((struct wlan_bssid_ex *)pnetwork)); update_capinfo23a(padapter, rtw_get_capability23a(pnetwork));
/* let pnetwork_mlmeext == pnetwork_mlme. */ /* let pnetwork_mlmeext == pnetwork_mlme. */
memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length); memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
@ -1047,7 +1047,7 @@ int rtw_check_beacon_data23a(struct rtw_adapter *padapter, u8 *pbuf,
HT_info_handler23a(padapter, (struct ndis_802_11_var_ies *)pHT_info_ie); HT_info_handler23a(padapter, (struct ndis_802_11_var_ies *)pHT_info_ie);
} }
pbss_network->Length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pbss_network); pbss_network->Length = get_wlan_bssid_ex_sz(pbss_network);
/* issue beacon to start bss network */ /* issue beacon to start bss network */
start_bss_network(padapter, (u8*)pbss_network); start_bss_network(padapter, (u8*)pbss_network);

2
drivers/staging/rtl8723au/core/rtw_mlme.c
View file

@ -2249,7 +2249,7 @@ void rtw_update_registrypriv_dev_network23a(struct rtw_adapter* adapter)
pdev_network->IELength = sz; pdev_network->IELength = sz;
pdev_network->Length = pdev_network->Length =
get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pdev_network); get_wlan_bssid_ex_sz(pdev_network);
/* notes: translate IELength & Length after assign the /* notes: translate IELength & Length after assign the
Length to cmdsz in createbss_cmd(); */ Length to cmdsz in createbss_cmd(); */

8
drivers/staging/rtl8723au/core/rtw_wlan_util.c
View file

@ -1007,7 +1007,7 @@ int rtw_check_bcn_info23a(struct rtw_adapter *Adapter,
} }
/* check encryption info */ /* check encryption info */
val16 = rtw_get_capability23a((struct wlan_bssid_ex *)bssid); val16 = rtw_get_capability23a(bssid);
if (val16 & BIT(4)) if (val16 & BIT(4))
bssid->Privacy = 1; bssid->Privacy = 1;
@ -1141,7 +1141,7 @@ unsigned int is_ap_in_tkip23a(struct rtw_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
if (rtw_get_capability23a((struct wlan_bssid_ex *)cur_network) & WLAN_CAPABILITY_PRIVACY) { if (rtw_get_capability23a(cur_network) & WLAN_CAPABILITY_PRIVACY) {
for (i = sizeof(struct ndis_802_11_fixed_ies); i < pmlmeinfo->network.IELength;) { for (i = sizeof(struct ndis_802_11_fixed_ies); i < pmlmeinfo->network.IELength;) {
pIE = (struct ndis_802_11_var_ies *)(pmlmeinfo->network.IEs + i); pIE = (struct ndis_802_11_var_ies *)(pmlmeinfo->network.IEs + i);
@ -1172,7 +1172,7 @@ unsigned int should_forbid_n_rate23a(struct rtw_adapter * padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *cur_network = &pmlmepriv->cur_network.network; struct wlan_bssid_ex *cur_network = &pmlmepriv->cur_network.network;
if (rtw_get_capability23a((struct wlan_bssid_ex *)cur_network) & WLAN_CAPABILITY_PRIVACY) { if (rtw_get_capability23a(cur_network) & WLAN_CAPABILITY_PRIVACY) {
for (i = sizeof(struct ndis_802_11_fixed_ies); i < cur_network->IELength;) { for (i = sizeof(struct ndis_802_11_fixed_ies); i < cur_network->IELength;) {
pIE = (struct ndis_802_11_var_ies *)(cur_network->IEs + i); pIE = (struct ndis_802_11_var_ies *)(cur_network->IEs + i);
@ -1207,7 +1207,7 @@ unsigned int is_ap_in_wep23a(struct rtw_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
if (rtw_get_capability23a((struct wlan_bssid_ex *)cur_network) & WLAN_CAPABILITY_PRIVACY) { if (rtw_get_capability23a(cur_network) & WLAN_CAPABILITY_PRIVACY) {
for (i = sizeof(struct ndis_802_11_fixed_ies); i < pmlmeinfo->network.IELength;) { for (i = sizeof(struct ndis_802_11_fixed_ies); i < pmlmeinfo->network.IELength;) {
pIE = (struct ndis_802_11_var_ies *)(pmlmeinfo->network.IEs + i); pIE = (struct ndis_802_11_var_ies *)(pmlmeinfo->network.IEs + i);