rtl8188eu: Replace typedef for WLAN_BSSID_EX

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-06 18:26:23 -06:00
parent 5d615fab61
commit 4bf02bb7d8
24 changed files with 138 additions and 141 deletions

View file

@ -510,7 +510,7 @@ exit:
*/
int rtw_cfg80211_check_bss(struct adapter *padapter)
{
WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct cfg80211_bss *bss = NULL;
struct ieee80211_channel *notify_channel = NULL;
u32 freq;
@ -550,13 +550,13 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
}
if (!rtw_cfg80211_check_bss(padapter)) {
WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_network *scanned = pmlmepriv->cur_network_scanned;
if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true)
{
memcpy(&cur_network->network, pnetwork, sizeof(WLAN_BSSID_EX));
memcpy(&cur_network->network, pnetwork, sizeof(struct wlan_bssid_ex));
if(cur_network)
{
if (!rtw_cfg80211_inform_bss(padapter,cur_network))
@ -641,7 +641,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
#endif /* CONFIG_P2P */
{
WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_network *scanned = pmlmepriv->cur_network_scanned;
/* DBG_871X(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */
@ -3536,8 +3536,8 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
adapter->mlmeextpriv.mlmext_info.hidden_ssid_mode = settings->hidden_ssid;
if (settings->ssid && settings->ssid_len) {
WLAN_BSSID_EX *pbss_network = &adapter->mlmepriv.cur_network.network;
WLAN_BSSID_EX *pbss_network_ext = &adapter->mlmeextpriv.mlmext_info.network;
struct wlan_bssid_ex *pbss_network = &adapter->mlmepriv.cur_network.network;
struct wlan_bssid_ex *pbss_network_ext = &adapter->mlmeextpriv.mlmext_info.network;
memcpy(pbss_network->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len);
pbss_network->Ssid.SsidLength = settings->ssid_len;

View file

@ -198,7 +198,7 @@ void rtw_indicate_wx_assoc_event(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
memset(&wrqu, 0, sizeof(union iwreq_data));
@ -1044,7 +1044,7 @@ static int rtw_wx_get_name(struct net_device *dev,
char *p;
u8 ht_cap=false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
NDIS_802_11_RATES_EX* prates = NULL;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("cmd_code=%x\n", info->cmd));
@ -1125,7 +1125,7 @@ static int rtw_wx_get_freq(struct net_device *dev,
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
if(check_fwstate(pmlmepriv, _FW_LINKED) == true)
{
@ -1555,7 +1555,7 @@ static int rtw_wx_get_wap(struct net_device *dev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
wrqu->ap_addr.sa_family = ARPHRD_ETHER;
@ -2078,7 +2078,7 @@ static int rtw_wx_get_essid(struct net_device *dev,
u32 len,ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_essid\n"));
@ -7354,8 +7354,8 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,
ssid_ie = rtw_get_ie(param->u.bcn_ie.buf, WLAN_EID_SSID, &ssid_len, ie_len);
if (ssid_ie && ssid_len) {
WLAN_BSSID_EX *pbss_network = &mlmepriv->cur_network.network;
WLAN_BSSID_EX *pbss_network_ext = &mlmeinfo->network;
struct wlan_bssid_ex *pbss_network = &mlmepriv->cur_network.network;
struct wlan_bssid_ex *pbss_network_ext = &mlmeinfo->network;
memcpy(ssid, ssid_ie+2, ssid_len);
ssid[ssid_len>NDIS_802_11_LENGTH_SSID?NDIS_802_11_LENGTH_SSID:ssid_len] = 0x0;
@ -9020,7 +9020,7 @@ static s32 createpseudoadhoc(struct adapter *padapter)
NDIS_802_11_AUTHENTICATION_MODE authmode;
struct mlme_priv *pmlmepriv;
NDIS_802_11_SSID *passoc_ssid;
WLAN_BSSID_EX *pdev_network;
struct wlan_bssid_ex *pdev_network;
u8 *pibss;
u8 ssid[] = "pseduo_ad-hoc";
s32 err;