skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Fix some checkpatch warnings

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-08-30 13:19:58 -05:00
parent 0b659bd591
commit 242c9f54cc
32 changed files with 501 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

140
os_dep/ioctl_cfg80211.c
View file

@ -343,7 +343,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
struct wireless_dev *wdev = padapter->rtw_wdev;
struct wiphy *wiphy = wdev->wiphy;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
/* DBG_8192C("%s\n", __func__); */
@ -419,7 +419,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
pbuf = buf;
pwlanhdr = (struct rtw_ieee80211_hdr *)pbuf;
fctrl = &(pwlanhdr->frame_ctl);
fctrl = &pwlanhdr->frame_ctl;
*(fctrl) = 0;
SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/);
@ -429,7 +429,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN);
SetFrameSubType(pbuf, WIFI_BEACON);
} else {
memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pwlanhdr->addr1, myid(&padapter->eeprompriv), ETH_ALEN);
SetFrameSubType(pbuf, WIFI_PROBERSP);
}
@ -509,7 +509,7 @@ exit:
*/
int rtw_cfg80211_check_bss(struct adapter *padapter)
{
struct 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;
@ -534,7 +534,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter)
void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *cur_network = &pmlmepriv->cur_network;
struct wireless_dev *pwdev = padapter->rtw_wdev;
struct cfg80211_bss *bss = NULL;
struct ieee80211_channel *notify_channel;
@ -549,7 +549,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
}
if (!rtw_cfg80211_check_bss(padapter)) {
struct 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)
@ -571,7 +571,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
return;
}
if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(struct ndis_802_11_ssid)) == true
if (_rtw_memcmp(&scanned->network.Ssid, &pnetwork->Ssid, sizeof(struct ndis_802_11_ssid)) == true
&& _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(ETH_ALEN)) == true
) {
if (!rtw_cfg80211_inform_bss(padapter,scanned)) {
@ -604,10 +604,10 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
void rtw_cfg80211_indicate_connect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *cur_network = &pmlmepriv->cur_network;
struct wireless_dev *pwdev = padapter->rtw_wdev;
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
#endif
struct cfg80211_bss *bss = NULL;
@ -637,7 +637,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
#endif /* CONFIG_P2P */
{
struct 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_88E(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */
@ -648,7 +648,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
}
if (_rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(ETH_ALEN)) == true
&& _rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(struct ndis_802_11_ssid)) == true
&& _rtw_memcmp(&scanned->network.Ssid, &pnetwork->Ssid, sizeof(struct ndis_802_11_ssid)) == true
) {
if (!rtw_cfg80211_inform_bss(padapter,scanned)) {
DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
@ -726,7 +726,7 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wireless_dev *pwdev = padapter->rtw_wdev;
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
#endif
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
@ -813,7 +813,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
u8 keylen;
struct cmd_obj* pcmd;
struct setkey_parm *psetkeyparm;
struct cmd_priv *pcmdpriv=&(padapter->cmdpriv);
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
int res=_SUCCESS;
DBG_8192C("%s\n", __FUNCTION__);
@ -854,7 +854,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
keylen = 16;
}
memcpy(&(psetkeyparm->key[0]), key, keylen);
memcpy(&psetkeyparm->key[0], key, keylen);
pcmd->cmdcode = _SetKey_CMD_;
pcmd->parmbuf = (u8 *)psetkeyparm;
@ -901,7 +901,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
struct sta_info *psta = NULL, *pbcmc_sta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv* psecuritypriv=&(padapter->securitypriv);
struct security_priv* psecuritypriv=&padapter->securitypriv;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_8192C("%s\n", __FUNCTION__);
@ -985,7 +985,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx;
}
memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len);
memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], param->u.crypt.key, wep_key_len);
psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len;
@ -1023,8 +1023,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
/* DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); */
/* set mic key */
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);
psecuritypriv->busetkipkey = true;
@ -1091,8 +1091,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
/* DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); */
/* set mic key */
memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8);
memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8);
memcpy(psta->dot11tkiptxmickey.skey, &param->u.crypt.key[16], 8);
memcpy(psta->dot11tkiprxmickey.skey, &param->u.crypt.key[24], 8);
psecuritypriv->busetkipkey = true;
@ -1138,8 +1138,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
/* DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); */
/* set mic key */
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);
psecuritypriv->busetkipkey = true;
@ -1257,7 +1257,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx;
}
memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len);
memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], param->u.crypt.key, wep_key_len);
psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len;
@ -1303,8 +1303,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
if (strcmp(param->u.crypt.alg, "TKIP") == 0)/* set mic key */
{
/* DEBUG_ERR(("\nset key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); */
memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8);
memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8);
memcpy(psta->dot11tkiptxmickey.skey, &param->u.crypt.key[16], 8);
memcpy(psta->dot11tkiprxmickey.skey, &param->u.crypt.key[24], 8);
padapter->securitypriv.busetkipkey=false;
/* _set_timer(&padapter->securitypriv.tkip_timer, 50); */
@ -1320,8 +1320,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
if (strcmp(param->u.crypt.alg, "TKIP") == 0 || strcmp(param->u.crypt.alg, "CCMP") == 0)
{
memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len));
memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8);
memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8);
memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&param->u.crypt.key[16],8);
memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&param->u.crypt.key[24],8);
padapter->securitypriv.binstallGrpkey = true;
/* DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); */
DBG_88E(" ~~~~set sta key:groupkey\n");
@ -1617,7 +1617,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
&& check_fwstate(pmlmepriv, _FW_LINKED)
)
{
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *cur_network = &pmlmepriv->cur_network;
if (_rtw_memcmp((void *)mac, cur_network->network.MacAddress, ETH_ALEN) == false) {
DBG_88E("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress));
@ -1670,10 +1670,10 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
enum nl80211_iftype old_type;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ;
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy);
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
#endif
int ret = 0;
u8 change = false;
@ -1815,8 +1815,8 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
{
unsigned long irqL;
struct list_head *plist, *phead;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u32 cnt=0;
u32 wait_for_surveydone;
@ -1830,7 +1830,7 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
DBG_8192C("%s\n", __func__);
#endif
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -1844,7 +1844,7 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
/* report network only if the current channel set contains the channel to which this network belongs */
if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
&& true == rtw_validate_ssid(&(pnetwork->network.Ssid))
&& true == rtw_validate_ssid(&pnetwork->network.Ssid)
)
{
/* ev=translate_scan(padapter, a, pnetwork, ev, stop); */
@ -1855,7 +1855,7 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
/* call this after other things have been done */
rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), false);
@ -1870,7 +1870,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b
u8 *p2p_ie;
u32 wfd_ielen = 0;
u8 *wfd_ie;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_DEBUG_CFG80211
DBG_8192C("%s, ielen=%d\n", __func__, len);
@ -2001,7 +2001,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
u8 survey_times=3;
u8 survey_times_for_one_ch=6;
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
#endif /* CONFIG_P2P */
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
struct cfg80211_ssid *ssids = request->ssids;
@ -2416,7 +2416,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
{/* check p2p_ie for assoc req; */
uint p2p_ielen=0;
u8 *p2p_ie;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if ((p2p_ie=rtw_get_p2p_ie(buf, ielen, NULL, &p2p_ielen)))
{
@ -2447,7 +2447,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
{/* check wfd_ie for assoc req; */
uint wfd_ielen=0;
u8 *wfd_ie;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (rtw_get_wfd_ie(buf, ielen, NULL, &wfd_ielen))
{
@ -2932,7 +2932,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame,
s32 freq;
int channel;
struct wireless_dev *pwdev = padapter->rtw_wdev;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct net_device *ndev = padapter->pnetdev;
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
@ -2961,8 +2961,8 @@ void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
u8 mgmt_buf[128] = {0};
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct net_device *ndev = padapter->pnetdev;
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
@ -3071,8 +3071,8 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
/* u8 category, action, OUI_Subtype, dialogToken=0; */
/* unsigned char *frame_body; */
struct rtw_ieee80211_hdr *pwlanhdr;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
u8 *buf = skb->data;
u32 len = skb->len;
u8 category, action;
@ -3373,7 +3373,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l
uint p2p_ielen=0;
u8 *p2p_ie;
u8 got_p2p_ie = false;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
/* struct sta_priv *pstapriv = &padapter->stapriv; */
@ -3415,7 +3415,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l
if (rtw_get_p2p_ie(pbuf+_FIXED_IE_LENGTH_, len-_FIXED_IE_LENGTH_, NULL, &p2p_ielen))
{
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
struct wifidirect_info *pwdinfo= &(adapter->wdinfo);
struct wifidirect_info *pwdinfo= &adapter->wdinfo;
DBG_8192C("got p2p_ie, len=%d\n", p2p_ielen);
got_p2p_ie = true;
@ -3449,7 +3449,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l
if (got_p2p_ie == true)
{
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
struct wifidirect_info *pwdinfo= &(adapter->wdinfo);
struct wifidirect_info *pwdinfo= &adapter->wdinfo;
pwdinfo->operating_channel = pmlmeext->cur_channel;
}
#endif /* CONFIG_P2P */
@ -3483,7 +3483,7 @@ static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct beacon_parameters *info)
{
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@ -3579,7 +3579,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
u8 updated;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
const u8 *mac = params->mac;
@ -3743,7 +3743,7 @@ void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint
int type;
s32 freq;
int channel;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
u8 category, action;
channel = rtw_get_oper_ch(padapter);
@ -3775,7 +3775,7 @@ void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame
int type;
s32 freq;
int channel;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
u8 category, action;
channel = rtw_get_oper_ch(padapter);
@ -3814,7 +3814,7 @@ void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len,
{
s32 freq;
int channel;
struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
u8 category, action;
@ -3868,11 +3868,11 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
__le16 *fctrl;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 *frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr));
size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr);
__be16 be_tmp;
@ -3936,11 +3936,11 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
fctrl = &(pwlanhdr->frame_ctl);
fctrl = &pwlanhdr->frame_ctl;
*(fctrl) = 0;
memcpy(pwlanhdr->addr1, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN);
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);
memcpy(pwlanhdr->addr3, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
@ -3950,11 +3950,11 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &(p2poui), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &category, &pattrib->pktlen);
pframe = rtw_set_fixed_ie(pframe, 1, &action, &pattrib->pktlen);
pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *) &p2poui, &pattrib->pktlen);
pframe = rtw_set_fixed_ie(pframe, 1, &oui_subtype, &pattrib->pktlen);
pframe = rtw_set_fixed_ie(pframe, 1, &dialogToken, &pattrib->pktlen);
/* build_prov_disc_request_p2p_ie */
@ -4199,9 +4199,9 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b
bool ack = true;
struct rtw_ieee80211_hdr *pwlanhdr;
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
/* struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; */
@ -4450,8 +4450,8 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
u32 wfd_ielen = 0;
u8 *wfd_ie;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
DBG_88E(FUNC_NDEV_FMT" ielen=%d\n", FUNC_NDEV_ARG(ndev), len);
@ -4562,7 +4562,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
u32 wfd_ielen = 0;
u8 *wfd_ie;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_DEBUG_CFG80211
DBG_8192C("%s, ielen=%d\n", __func__, len);
@ -4737,7 +4737,7 @@ static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *bu
{
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
DBG_8192C("%s, ielen=%d\n", __func__, len);

272
os_dep/ioctl_linux.c
View file

@ -197,8 +197,8 @@ void rtw_indicate_wx_assoc_event(struct adapter *padapter)
union iwreq_data wrqu;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&pmlmeinfo->network);
memset(&wrqu, 0, sizeof(union iwreq_data));
@ -226,7 +226,7 @@ static char *translate_scan(struct adapter *padapter,
struct iw_request_info* info, struct wlan_network *pnetwork,
char *start, char *stop)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 ss, sq;
struct iw_event iwe;
u16 cap;
@ -600,7 +600,7 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
struct adapter *padapter = (struct adapter *) rtw_netdev_priv(dev);
int ret = 0;
if ((value & AUTH_ALG_SHARED_KEY)&&(value & AUTH_ALG_OPEN_SYSTEM))
if ((value & AUTH_ALG_SHARED_KEY)&&value & AUTH_ALG_OPEN_SYSTEM)
{
DBG_88E("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY and AUTH_ALG_OPEN_SYSTEM [value:0x%x]\n",value);
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
@ -747,7 +747,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
ret = -EOPNOTSUPP ;
goto exit;
}
memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], pwep->KeyMaterial, pwep->KeyLength);
psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength;
rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0,true);
}
@ -784,8 +784,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
if (strcmp(param->u.crypt.alg, "TKIP") == 0)/* set mic key */
{
memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8);
memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8);
memcpy(psta->dot11tkiptxmickey.skey, &param->u.crypt.key[16], 8);
memcpy(psta->dot11tkiprxmickey.skey, &param->u.crypt.key[24], 8);
padapter->securitypriv.busetkipkey=false;
}
@ -803,8 +803,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
/* only TKIP group key need to install this */
if (param->u.crypt.key_len > 16)
{
memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8);
memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8);
memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&param->u.crypt.key[16],8);
memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&param->u.crypt.key[24],8);
}
padapter->securitypriv.binstallGrpkey = true;
DBG_88E(" ~~~~set sta key:groupkey\n");
@ -983,7 +983,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
{
eid = buf[cnt];
if ((eid==_VENDOR_SPECIFIC_IE_)&&(_rtw_memcmp(&buf[cnt+2], wps_oui, 4)==true))
if ((eid==_VENDOR_SPECIFIC_IE_)&&_rtw_memcmp(&buf[cnt+2], wps_oui, 4==true))
{
DBG_88E("SET WPS_IE\n");
@ -1037,7 +1037,7 @@ static int rtw_wx_get_name(struct net_device *dev,
u32 ht_ielen = 0;
char *p;
u8 ht_cap=false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
u8 *prates;
@ -1097,7 +1097,7 @@ static int rtw_wx_get_freq(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
@ -1183,7 +1183,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
union iwreq_data *wrqu, char *b)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode\n"));
@ -1403,10 +1403,10 @@ static int rtw_wx_set_wap(struct net_device *dev,
uint ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct sockaddr *temp = (struct sockaddr *)awrq;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct list_head *phead;
u8 *dst_bssid, *src_bssid;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
enum NDIS_802_11_AUTHENTICATION_MODE authmode;
@ -1480,7 +1480,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);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
wrqu->ap_addr.sa_family = ARPHRD_ETHER;
@ -1554,7 +1554,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
unsigned long irqL;
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
#endif /* CONFIG_P2P */
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_set_scan\n"));
@ -1744,8 +1744,8 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
unsigned long irqL;
struct list_head *plist, *phead;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
char *ev = extra;
char *stop = ev + wrqu->data.length;
@ -1800,7 +1800,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
if (check_fwstate(pmlmepriv, wait_status))
return -EAGAIN;
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -1819,7 +1819,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
/* report network only if the current channel set contains the channel to which this network belongs */
if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
&& true == rtw_validate_ssid(&(pnetwork->network.Ssid))
&& true == rtw_validate_ssid(&pnetwork->network.Ssid)
)
{
ev=translate_scan(padapter, a, pnetwork, ev, stop);
@ -1829,7 +1829,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
wrqu->data.length = ev-extra;
wrqu->data.flags = 0;
@ -2001,7 +2001,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);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_wx_get_essid\n"));
@ -2237,7 +2237,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
struct ndis_802_11_wep wep;
enum NDIS_802_11_AUTHENTICATION_MODE authmode;
struct iw_point *erq = &(wrqu->encoding);
struct iw_point *erq = &wrqu->encoding;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
DBG_88E("+rtw_wx_set_enc, flags=0x%x\n", erq->flags);
@ -2350,8 +2350,8 @@ static int rtw_wx_get_enc(struct net_device *dev,
{
uint key, ret =0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *erq = &(wrqu->encoding);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct iw_point *erq = &wrqu->encoding;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
;
@ -2439,11 +2439,11 @@ static int rtw_wx_set_auth(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_param *param = (struct iw_param*)&(wrqu->param);
struct iw_param *param = (struct iw_param*)&wrqu->param;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
u32 value = param->value;
int ret = 0;
@ -3109,8 +3109,8 @@ static int rtw_get_ap_info(struct net_device *dev,
char data[32];
struct wlan_network *pnetwork = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *queue = &pmlmepriv->scanned_queue;
struct iw_point *pdata = &wrqu->data;
DBG_88E("+rtw_get_aplist_info\n");
@ -3146,7 +3146,7 @@ static int rtw_get_ap_info(struct net_device *dev,
goto exit;
}
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -3163,7 +3163,7 @@ static int rtw_get_ap_info(struct net_device *dev,
if (hwaddr_aton_i(data, bssid))
{
DBG_88E("Invalid BSSID '%s'.\n", (u8*)data);
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
return -EINVAL;
}
@ -3192,7 +3192,7 @@ static int rtw_get_ap_info(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if (pdata->length>=34) {
if (copy_to_user((u8 __user *)pdata->pointer+32, (u8*)&pdata->flags, 1)) {
@ -3289,9 +3289,9 @@ static int rtw_wext_p2p_enable(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
enum P2P_ROLE init_role = P2P_ROLE_DISABLE;
@ -3346,9 +3346,9 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
DBG_88E( "[%s] ssid = %s, len = %zu\n", __FUNCTION__, extra, strlen( extra ) );
memcpy( pwdinfo->nego_ssid, extra, strlen( extra ) );
@ -3365,7 +3365,7 @@ static int rtw_p2p_set_intent(struct net_device *dev,
{
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
u8 intent = pwdinfo->intent;
extra[ wrqu->data.length ] = 0x00;
@ -3394,7 +3394,7 @@ static int rtw_p2p_set_listen_ch(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
u8 listen_ch = pwdinfo->listen_channel; /* Listen channel number */
extra[ wrqu->data.length ] = 0x00;
@ -3425,7 +3425,7 @@ static int rtw_p2p_set_op_ch(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
u8 op_ch = pwdinfo->operating_channel; /* Operating channel number */
extra[ wrqu->data.length ] = 0x00;
@ -3454,7 +3454,7 @@ static int rtw_p2p_profilefound(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
/* Comment by Albert 2010/10/13 */
/* Input data format: */
@ -3513,7 +3513,7 @@ static int rtw_p2p_setDN(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
DBG_88E( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 );
@ -3534,7 +3534,7 @@ static int rtw_p2p_get_status(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
if ( padapter->bShowGetP2PState )
{
@ -3566,7 +3566,7 @@ static int rtw_p2p_get_req_cm(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
sprintf( extra, "\n\nCM=%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
wrqu->data.length = strlen( extra );
@ -3583,7 +3583,7 @@ static int rtw_p2p_get_role(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@ -3605,7 +3605,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@ -3629,7 +3629,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
pwdinfo->rx_prov_disc_info.peerDevAddr[ 0 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 1 ],
@ -3653,7 +3653,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
pwdinfo->p2p_peer_device_addr[ 0 ], pwdinfo->p2p_peer_device_addr[ 1 ],
@ -3677,7 +3677,7 @@ static int rtw_p2p_get_groupid(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
sprintf( extra, "\n%.2X:%.2X:%.2X:%.2X:%.2X:%.2X %s",
pwdinfo->groupid_info.go_device_addr[ 0 ], pwdinfo->groupid_info.go_device_addr[ 1 ],
@ -3698,7 +3698,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] Op_ch = %02x\n", __FUNCTION__, pwdinfo->operating_channel);
@ -3729,7 +3729,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL;
struct list_head *plist,*phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
__be16 be_attr_content = 0;
@ -3746,7 +3746,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
macstr2num(peerMAC, subcmd);
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -3780,7 +3780,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if (!blnMatch)
sprintf(attr_content_str, "\n\nM=0000");
@ -3800,7 +3800,7 @@ static int rtw_p2p_get_peer_wfd_port(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] p2p_state = %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) );
@ -3820,7 +3820,7 @@ static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
sprintf( extra, "\n\nwfd_pc=%d\n", pwdinfo->wfd_info->wfd_pc );
DBG_88E( "[%s] wfd_pc = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_pc );
@ -3839,7 +3839,7 @@ static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
sprintf( extra, "\n\nwfd_sa=%d\n", pwdinfo->wfd_info->peer_session_avail );
DBG_88E( "[%s] wfd_sa = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_session_avail );
@ -3863,7 +3863,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 *p2pie;
@ -3879,7 +3879,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
macstr2num(peerMAC, subcmd);
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -3926,7 +3926,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if (!blnMatch) {
sprintf(go_devadd_str, "\n\ndev_add= NULL");
@ -3953,7 +3953,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 dev_type[8] = { 0x00 };
@ -3969,7 +3969,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
macstr2num(peerMAC, subcmd);
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -4006,7 +4006,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if (!blnMatch)
sprintf(dev_type_str, "\n\nN=00");
@ -4028,7 +4028,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 dev_name[WPS_MAX_DEVICE_NAME_LEN] = { 0x00 };
@ -4044,7 +4044,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
macstr2num(peerMAC, subcmd);
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -4077,7 +4077,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if (!blnMatch)
sprintf(dev_name_str, "\n\nN=0000");
@ -4099,7 +4099,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 *p2pie;
@ -4115,7 +4115,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
macstr2num(peerMAC, subcmd);
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -4154,7 +4154,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if (!blnMatch) {
sprintf(inv_proc_str, "\nIP=-1");
@ -4178,14 +4178,14 @@ static int rtw_p2p_connect(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
u8 peerMAC[ ETH_ALEN ] = { 0x00 };
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
@ -4214,7 +4214,7 @@ static int rtw_p2p_connect(struct net_device *dev,
peerMAC[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] );
}
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -4235,7 +4235,7 @@ static int rtw_p2p_connect(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if ( uintPeerChannel ) {
memset( &pwdinfo->nego_req_info, 0x00, sizeof( struct tx_nego_req_info ) );
@ -4274,12 +4274,12 @@ static int rtw_p2p_invite_req(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
u8 attr_content[50] = { 0x00 }, _status = 0;
@ -4329,7 +4329,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
pinvite_req_info->peer_macaddr[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] );
}
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -4375,7 +4375,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
#ifdef CONFIG_P2P
if ( uintPeerChannel )
@ -4454,12 +4454,12 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
u8 attr_content[50] = { 0x00 }, _status = 0;
@ -4565,7 +4565,7 @@ static int rtw_p2p_set_wps_uuid(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
DBG_88E("[%s] data = %s\n", __FUNCTION__, extra);
@ -4589,13 +4589,13 @@ static int rtw_p2p_set_pc(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
u8 peerMAC[ ETH_ALEN ] = { 0x00 };
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
u8 attr_content[50] = { 0x00 }, _status = 0;
u8 *p2pie;
@ -4621,7 +4621,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
peerMAC[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] );
}
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -4669,7 +4669,7 @@ static int rtw_p2p_set_pc(struct net_device *dev,
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
printk( "[%s] channel = %d\n", __FUNCTION__, uintPeerChannel );
if ( uintPeerChannel )
@ -4721,7 +4721,7 @@ static int rtw_p2p_set_wfd_device_type(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
struct wifi_display_info* pwfd_info = pwdinfo->wfd_info;
/* Commented by Albert 20120328 */
@ -4754,7 +4754,7 @@ static int rtw_p2p_set_scan_result_type(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
struct wifi_display_info *pwfd_info = pwdinfo->wfd_info;
/* Commented by Albert 20120328 */
@ -4799,7 +4799,7 @@ static int rtw_p2p_set_wfd_enable(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
if (*extra == '0' )
pwdinfo->wfd_info->wfd_enable = false;
@ -4820,7 +4820,7 @@ static int rtw_p2p_set_driver_iface(struct net_device *dev,
/* This function is used to set driver iface is WEXT or CFG80211 */
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
if (*extra == '1' )
{
@ -4846,7 +4846,7 @@ static int rtw_p2p_set_sa(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
struct wifi_display_info *pwfd_info = pwdinfo->wfd_info;
DBG_88E( "[%s] data = %s\n", __FUNCTION__, extra );
@ -4886,13 +4886,13 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
{
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
u8 peerMAC[ ETH_ALEN ] = { 0x00 };
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
u8 attr_content[100] = { 0x00 }, _status = 0;
@ -4954,7 +4954,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
return( ret );
}
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue);
plist = get_next(phead);
@ -5011,7 +5011,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
plist = get_next(plist);
}
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
if ( uintPeerChannel )
{
@ -5096,7 +5096,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev,
int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
struct wifidirect_info *pwdinfo = & padapter->wdinfo ;
DBG_88E( "[%s] data = %s\n", __FUNCTION__, extra );
@ -5142,9 +5142,9 @@ static int rtw_p2p_set(struct net_device *dev,
#ifdef CONFIG_P2P
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
DBG_88E( "[%s] extra = %s\n", __FUNCTION__, extra );
@ -5273,9 +5273,9 @@ static int rtw_p2p_get(struct net_device *dev,
#ifdef CONFIG_P2P
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct iw_point *pdata = &wrqu->data;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
struct wifidirect_info *pwdinfo= &padapter->wdinfo;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
if ( padapter->bShowGetP2PState )
@ -5534,11 +5534,11 @@ static int rtw_dbg_port(struct net_device *dev,
u32 extra_arg, *pdata, val32;
struct sta_info *psta;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct security_priv *psecuritypriv = &padapter->securitypriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *cur_network = &pmlmepriv->cur_network;
struct sta_priv *pstapriv = &padapter->stapriv;
@ -5874,7 +5874,7 @@ static int rtw_dbg_port(struct net_device *dev,
for (i=0; i< NUM_STA; i++)
{
phead = &(pstapriv->sta_hash[i]);
phead = &pstapriv->sta_hash[i];
plist = get_next(phead);
while ((rtw_end_of_queue_search(phead, plist)) == false)
@ -5933,7 +5933,7 @@ static int rtw_dbg_port(struct net_device *dev,
for (i=0; i< NUM_STA; i++)
{
phead = &(pstapriv->sta_hash[i]);
phead = &pstapriv->sta_hash[i];
plist = get_next(phead);
while ((rtw_end_of_queue_search(phead, plist)) == false)
@ -5979,11 +5979,11 @@ static int rtw_dbg_port(struct net_device *dev,
if (arg == 0) {
DBG_88E("dump rx packet (%d)\n",extra_arg);
/* pHalData->bDumpRxPkt =extra_arg; */
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_RXPKT, &(extra_arg));
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_RXPKT, &extra_arg);
}
else if (arg==1) {
DBG_88E("dump tx packet (%d)\n",extra_arg);
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(extra_arg));
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &extra_arg);
}
}
break;
@ -6012,7 +6012,7 @@ static int rtw_dbg_port(struct net_device *dev,
case 0x11:
DBG_88E("turn %s Rx RSSI display function\n",(extra_arg==1)?"on":"off");
padapter->bRxRSSIDisplay = extra_arg;
rtw_hal_set_def_var(padapter, HW_DEF_FA_CNT_DUMP, &(padapter->bRxRSSIDisplay));
rtw_hal_set_def_var(padapter, HW_DEF_FA_CNT_DUMP, &padapter->bRxRSSIDisplay);
break;
case 0x12: /* set rx_stbc */
{
@ -6064,7 +6064,7 @@ static int rtw_dbg_port(struct net_device *dev,
#ifdef DBG_FIXED_CHAN
case 0x17:
{
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
printk("===> Fixed channel to %d\n",extra_arg);
pmlmeext->fixed_chan = extra_arg;
@ -6133,7 +6133,7 @@ static int rtw_dbg_port(struct net_device *dev,
extra_arg = 2 - disable tx power tracking
extra_arg = 3 - turn on all dynamic func
*/
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &(extra_arg));
rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &extra_arg);
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag);
DBG_88E(" === DMFlag(0x%08x) ===\n",odm_flag);
}
@ -6385,7 +6385,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
u8 keylen;
struct cmd_obj* pcmd;
struct setkey_parm *psetkeyparm;
struct cmd_priv *pcmdpriv=&(padapter->cmdpriv);
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
int res=_SUCCESS;
DBG_88E("%s\n", __FUNCTION__);
@ -6426,7 +6426,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
keylen = 16;
}
memcpy(&(psetkeyparm->key[0]), key, keylen);
memcpy(&psetkeyparm->key[0], key, keylen);
pcmd->cmdcode = _SetKey_CMD_;
pcmd->parmbuf = (u8 *)psetkeyparm;
@ -6475,7 +6475,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
struct sta_info *psta = NULL, *pbcmc_sta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv* psecuritypriv=&(padapter->securitypriv);
struct security_priv* psecuritypriv=&padapter->securitypriv;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("%s\n", __FUNCTION__);
@ -6573,7 +6573,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
}
psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx;
memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], pwep->KeyMaterial, pwep->KeyLength);
psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength;
@ -6584,7 +6584,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
/* don't update "psecuritypriv->dot11PrivacyAlgrthm" and */
/* psecuritypriv->dot11PrivacyKeyIndex=keyid", but can rtw_set_key to cam */
memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], pwep->KeyMaterial, pwep->KeyLength);
psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
@ -6624,8 +6624,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
/* DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); */
/* set mic key */
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);
psecuritypriv->busetkipkey = true;
@ -6692,8 +6692,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
/* DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); */
/* set mic key */
memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8);
memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8);
memcpy(psta->dot11tkiptxmickey.skey, &param->u.crypt.key[16], 8);
memcpy(psta->dot11tkiprxmickey.skey, &param->u.crypt.key[24], 8);
psecuritypriv->busetkipkey = true;
@ -6737,8 +6737,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
/* DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); */
/* set mic key */
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);
memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);
psecuritypriv->busetkipkey = true;
@ -6790,7 +6790,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int
{
int ret=0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv;
unsigned char *pbuf = param->u.bcn_ie.buf;
@ -6837,7 +6837,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
int ret=0;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("rtw_add_sta(aid=%d)=" MAC_FMT "\n", param->u.add_sta.aid, MAC_ARG(param->sta_addr));
@ -6904,7 +6904,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
int ret=0;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("rtw_del_sta=" MAC_FMT "\n", MAC_ARG(param->sta_addr));
@ -6957,7 +6957,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
int ret=0;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv;
struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param;
struct sta_data *psta_data = (struct sta_data *)param_ex->data;
@ -7016,7 +7016,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)
int ret=0;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("rtw_get_sta_wpaie, sta_addr: " MAC_FMT "\n", MAC_ARG(param->sta_addr));
@ -7069,9 +7069,9 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,
int ret=0;
unsigned char wps_oui[4]={0x0,0x50,0xf2,0x04};
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
int ie_len;
DBG_88E("%s, len=%d\n", __FUNCTION__, len);
@ -7114,7 +7114,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par
{
int ret=0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ie_len;
DBG_88E("%s, len=%d\n", __FUNCTION__, len);
@ -7151,7 +7151,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par
{
int ret=0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ie_len;
DBG_88E("%s, len=%d\n", __FUNCTION__, len);
@ -7189,9 +7189,9 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,
{
int ret=0;
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *mlmepriv = &(adapter->mlmepriv);
struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv);
struct mlme_ext_info *mlmeinfo = &(mlmeext->mlmext_info);
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
struct mlme_ext_priv *mlmeext = &adapter->mlmeextpriv;
struct mlme_ext_info *mlmeinfo = &mlmeext->mlmext_info;
int ie_len;
u8 *ssid_ie;
char ssid[NDIS_802_11_LENGTH_SSID + 1];
@ -7232,7 +7232,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p
{
int ret=0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
return -EINVAL;
@ -7254,7 +7254,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para
{
int ret=0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
return -EINVAL;
@ -7276,7 +7276,7 @@ static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param *
{
int ret=0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
return -EINVAL;
@ -7484,7 +7484,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
if (dwrq->flags == 0x8766 && len > 8)
{
u32 cp_sz;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 *probereq_wpsie = ext;
int probereq_wpsie_len = len;
u8 wps_oui[4]={0x0,0x50,0xf2,0x04};
@ -7542,7 +7542,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
break;
case ANDROID_WIFI_CMD_RSSI :
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {

10
os_dep/mlme_linux.c
View file

@ -91,12 +91,12 @@ void rtw_init_mlme_timer(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
_init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, rtw_join_timeout_handler, padapter);
_init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter);
_init_timer(&pmlmepriv->assoc_timer, padapter->pnetdev, rtw_join_timeout_handler, padapter);
_init_timer(&pmlmepriv->scan_to_timer, padapter->pnetdev, _rtw_scan_timeout_handler, padapter);
_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
_init_timer(&pmlmepriv->dynamic_chk_timer, padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
_init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
_init_timer(&pmlmepriv->set_scan_deny_timer, padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
#else
timer_setup(&pmlmepriv->assoc_timer, rtw_join_timeout_handler, 0);
timer_setup(&pmlmepriv->scan_to_timer, _rtw_scan_timeout_handler, 0);
@ -112,7 +112,7 @@ void rtw_init_mlme_timer(struct adapter *padapter)
void rtw_os_indicate_connect(struct adapter *adapter)
{
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) ||

12
os_dep/os_intfs.c
View file

@ -365,8 +365,8 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct recv_priv *precvpriv = &(padapter->recvpriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct recv_priv *precvpriv = &padapter->recvpriv;
padapter->stats.tx_packets = pxmitpriv->tx_pkts;/* pxmitpriv->tx_pkts++; */
padapter->stats.rx_packets = precvpriv->rx_pkts;/* precvpriv->rx_pkts++; */
@ -868,7 +868,7 @@ void rtw_cancel_all_timer(struct adapter *padapter)
rtw_hal_sw_led_deinit(padapter);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds!\n"));
_cancel_timer_ex(&(adapter_to_pwrctl(padapter)->pwr_state_check_timer));
_cancel_timer_ex(&adapter_to_pwrctl(padapter)->pwr_state_check_timer);
#ifdef CONFIG_P2P
_cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer);
@ -1178,9 +1178,9 @@ int netdev_open(struct net_device *pnetdev)
int ret;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
_enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
_enter_critical_mutex(&adapter_to_dvobj(padapter)->hw_init_mutex, NULL);
ret = _netdev_open(pnetdev);
_exit_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
_exit_critical_mutex(&adapter_to_dvobj(padapter)->hw_init_mutex, NULL);
return ret;
}
@ -1252,7 +1252,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)
void rtw_ips_dev_unload(struct adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
DBG_88E("====> %s...\n",__FUNCTION__);
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);

58
os_dep/osdep_service.c
View file

@ -206,10 +206,10 @@ int _rtw_mstat_dump(char *buf, int len)
int tx_alloc, tx_peak, tx_alloc_err, rx_alloc, rx_peak, rx_alloc_err;
for (i=0;i<mstat_tf_idx(MSTAT_TYPE_MAX);i++) {
value_t[0][i] = ATOMIC_READ(&(rtw_mem_type_stat[i].alloc));
value_t[1][i] = ATOMIC_READ(&(rtw_mem_type_stat[i].peak));
value_t[2][i] = ATOMIC_READ(&(rtw_mem_type_stat[i].alloc_cnt));
value_t[3][i] = ATOMIC_READ(&(rtw_mem_type_stat[i].alloc_err_cnt));
value_t[0][i] = ATOMIC_READ(&rtw_mem_type_stat[i].alloc);
value_t[1][i] = ATOMIC_READ(&rtw_mem_type_stat[i].peak);
value_t[2][i] = ATOMIC_READ(&rtw_mem_type_stat[i].alloc_cnt);
value_t[3][i] = ATOMIC_READ(&rtw_mem_type_stat[i].alloc_err_cnt);
}
cnt += snprintf(buf+cnt, len-cnt, "===================== MSTAT =====================\n");
cnt += snprintf(buf+cnt, len-cnt, "%4s %10s %10s %10s %10s\n", "TAG", "alloc", "peak", "aloc_cnt", "err_cnt");
@ -237,46 +237,46 @@ void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 s
/* initialization */
if (!update_time) {
for (i=0;i<mstat_tf_idx(MSTAT_TYPE_MAX);i++) {
ATOMIC_SET(&(rtw_mem_type_stat[i].alloc), 0);
ATOMIC_SET(&(rtw_mem_type_stat[i].peak), 0);
ATOMIC_SET(&(rtw_mem_type_stat[i].alloc_cnt), 0);
ATOMIC_SET(&(rtw_mem_type_stat[i].alloc_err_cnt), 0);
ATOMIC_SET(&rtw_mem_type_stat[i].alloc, 0);
ATOMIC_SET(&rtw_mem_type_stat[i].peak, 0);
ATOMIC_SET(&rtw_mem_type_stat[i].alloc_cnt, 0);
ATOMIC_SET(&rtw_mem_type_stat[i].alloc_err_cnt, 0);
}
for (i=0;i<mstat_ff_idx(MSTAT_FUNC_MAX);i++) {
ATOMIC_SET(&(rtw_mem_func_stat[i].alloc), 0);
ATOMIC_SET(&(rtw_mem_func_stat[i].peak), 0);
ATOMIC_SET(&(rtw_mem_func_stat[i].alloc_cnt), 0);
ATOMIC_SET(&(rtw_mem_func_stat[i].alloc_err_cnt), 0);
ATOMIC_SET(&rtw_mem_func_stat[i].alloc, 0);
ATOMIC_SET(&rtw_mem_func_stat[i].peak, 0);
ATOMIC_SET(&rtw_mem_func_stat[i].alloc_cnt, 0);
ATOMIC_SET(&rtw_mem_func_stat[i].alloc_err_cnt, 0);
}
}
switch (status) {
case MSTAT_ALLOC_SUCCESS:
ATOMIC_INC(&(rtw_mem_type_stat[mstat_tf_idx(flags)].alloc_cnt));
alloc = ATOMIC_ADD_RETURN(&(rtw_mem_type_stat[mstat_tf_idx(flags)].alloc), sz);
peak=ATOMIC_READ(&(rtw_mem_type_stat[mstat_tf_idx(flags)].peak));
ATOMIC_INC(&rtw_mem_type_stat[mstat_tf_idx(flags].alloc_cnt));
alloc = ATOMIC_ADD_RETURN(&rtw_mem_type_stat[mstat_tf_idx(flags].alloc), sz);
peak=ATOMIC_READ(&rtw_mem_type_stat[mstat_tf_idx(flags].peak));
if (peak<alloc)
ATOMIC_SET(&(rtw_mem_type_stat[mstat_tf_idx(flags)].peak), alloc);
ATOMIC_SET(&rtw_mem_type_stat[mstat_tf_idx(flags].peak), alloc);
ATOMIC_INC(&(rtw_mem_func_stat[mstat_ff_idx(flags)].alloc_cnt));
alloc = ATOMIC_ADD_RETURN(&(rtw_mem_func_stat[mstat_ff_idx(flags)].alloc), sz);
peak=ATOMIC_READ(&(rtw_mem_func_stat[mstat_ff_idx(flags)].peak));
ATOMIC_INC(&rtw_mem_func_stat[mstat_ff_idx(flags].alloc_cnt));
alloc = ATOMIC_ADD_RETURN(&rtw_mem_func_stat[mstat_ff_idx(flags].alloc), sz);
peak=ATOMIC_READ(&rtw_mem_func_stat[mstat_ff_idx(flags].peak));
if (peak<alloc)
ATOMIC_SET(&(rtw_mem_func_stat[mstat_ff_idx(flags)].peak), alloc);
ATOMIC_SET(&rtw_mem_func_stat[mstat_ff_idx(flags].peak), alloc);
break;
case MSTAT_ALLOC_FAIL:
ATOMIC_INC(&(rtw_mem_type_stat[mstat_tf_idx(flags)].alloc_err_cnt));
ATOMIC_INC(&rtw_mem_type_stat[mstat_tf_idx(flags].alloc_err_cnt));
ATOMIC_INC(&(rtw_mem_func_stat[mstat_ff_idx(flags)].alloc_err_cnt));
ATOMIC_INC(&rtw_mem_func_stat[mstat_ff_idx(flags].alloc_err_cnt));
break;
case MSTAT_FREE:
ATOMIC_DEC(&(rtw_mem_type_stat[mstat_tf_idx(flags)].alloc_cnt));
ATOMIC_SUB(&(rtw_mem_type_stat[mstat_tf_idx(flags)].alloc), sz);
ATOMIC_DEC(&rtw_mem_type_stat[mstat_tf_idx(flags].alloc_cnt));
ATOMIC_SUB(&rtw_mem_type_stat[mstat_tf_idx(flags].alloc), sz);
ATOMIC_DEC(&(rtw_mem_func_stat[mstat_ff_idx(flags)].alloc_cnt));
ATOMIC_SUB(&(rtw_mem_func_stat[mstat_ff_idx(flags)].alloc), sz);
ATOMIC_DEC(&rtw_mem_func_stat[mstat_ff_idx(flags].alloc_cnt));
ATOMIC_SUB(&rtw_mem_func_stat[mstat_ff_idx(flags].alloc), sz);
break;
};
@ -642,15 +642,15 @@ void _rtw_mutex_free(_mutex *pmutex)
void _rtw_init_queue(struct __queue *pqueue)
{
_rtw_init_listhead(&(pqueue->queue));
_rtw_init_listhead(&pqueue->queue);
spin_lock_init(&(pqueue->lock));
spin_lock_init(&pqueue->lock);
}
u32 _rtw_queue_empty(struct __queue *pqueue)
{
return (rtw_is_list_empty(&(pqueue->queue)));
return (rtw_is_list_empty(&pqueue->queue));
}

6
os_dep/recv_linux.c
View file

@ -201,8 +201,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
void *br_port = NULL;
#endif
precvpriv = &(padapter->recvpriv);
pfree_recv_queue = &(precvpriv->free_recv_queue);
precvpriv = &padapter->recvpriv;
pfree_recv_queue = &precvpriv->free_recv_queue;
#ifdef CONFIG_DRVEXT_MODULE
if (drvext_rx_handler(padapter, precv_frame->u.hdr.rx_data, precv_frame->u.hdr.len) == _SUCCESS)
@ -415,7 +415,7 @@ void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
struct adapter *padapter = preorder_ctrl->padapter;
_init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl);
_init_timer(&preorder_ctrl->reordering_ctrl_timer, padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl);
#else
timer_setup(&preorder_ctrl->reordering_ctrl_timer, _rtw_reordering_ctrl_timeout_handler, 0);

4
os_dep/rtw_android.c
View file

@ -242,7 +242,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr)
static int rtw_android_get_rssi(struct net_device *net, char *command, int total_len)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
@ -257,7 +257,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total
static int rtw_android_get_link_speed(struct net_device *net, char *command, int total_len)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
u16 link_speed = 0;

18
os_dep/usb_intf.c
View file

@ -344,7 +344,7 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
}
/* 3 misc */
_rtw_init_sema(&(pdvobjpriv->usb_suspend_sema), 0);
_rtw_init_sema(&pdvobjpriv->usb_suspend_sema, 0);
rtw_reset_continual_io_error(pdvobjpriv);
usb_get_dev(pusbd);
@ -723,8 +723,8 @@ int rtw_resume_process(struct adapter *padapter)
#ifdef CONFIG_BT_COEXIST
#ifdef CONFIG_AUTOSUSPEND
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_88E("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume);
pm_cnt=atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt));
DBG_88E("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&adapter_to_dvobj(padapter->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume);
pm_cnt=atomic_read(&adapter_to_dvobj(padapter->pusbintf->pm_usage_cnt));
#else
DBG_88E("...pm_usage_cnt(%d).....\n", adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt);
pm_cnt = adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt;
@ -838,7 +838,7 @@ void autosuspend_enter(struct adapter* padapter)
#endif /* ifndef CONFIG_BT_COEXIST */
}
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&dvobj->pusbintf->pm_usage_cnt));
#else
DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif
@ -848,9 +848,9 @@ int autoresume_enter(struct adapter* padapter)
{
int result = _SUCCESS;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct security_priv* psecuritypriv=&(padapter->securitypriv);
struct security_priv* psecuritypriv=&padapter->securitypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_88E("====> autoresume_enter\n");
@ -873,7 +873,7 @@ int autoresume_enter(struct adapter* padapter)
#endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&dvobj->pusbintf->pm_usage_cnt));
#else
DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif
@ -893,7 +893,7 @@ int autoresume_enter(struct adapter* padapter)
usb_autoresume_device(dvobj->pusbdev, 1);
#endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&dvobj->pusbintf->pm_usage_cnt));
#else
DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif
@ -1011,7 +1011,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&dvobj->pusbintf ->pm_usage_cnt));
#else
DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt);
#endif