skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-29 07:33:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Chnage "=NULL" to "= NULL"

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 13:31:56 -05:00
parent 16d2a24227
commit 51e6fae39e
21 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/rtw_ap.c
View file

@ -54,7 +54,7 @@ void init_mlme_ap_info(struct adapter *padapter)
void free_mlme_ap_info(struct adapter *padapter) void free_mlme_ap_info(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -93,7 +93,7 @@ static void update_BCNTIM(struct adapter *padapter)
/* if (pstapriv->tim_bitmap) */ /* if (pstapriv->tim_bitmap) */
if (true) if (true)
{ {
u8 *p, *dst_ie, *premainder_ie =NULL, *pbackup_remainder_ie =NULL; u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
__le16 tim_bitmap_le; __le16 tim_bitmap_le;
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen; uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
@ -200,7 +200,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8
struct ndis_802_11_variable_ies * pIE; struct ndis_802_11_variable_ies * pIE;
u8 bmatch = false; u8 bmatch = false;
u8 *pie = pnetwork->IEs; u8 *pie = pnetwork->IEs;
u8 *p, *dst_ie, *premainder_ie =NULL, *pbackup_remainder_ie =NULL; u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
u32 i, offset, ielen, ie_offset, remainder_ielen = 0; u32 i, offset, ielen, ie_offset, remainder_ielen = 0;
for (i = sizeof(struct ndis_802_11_fixed_ies); i < pnetwork->IELength;) for (i = sizeof(struct ndis_802_11_fixed_ies); i < pnetwork->IELength;)
@ -267,7 +267,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8
void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index) void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index)
{ {
u8 *p, *dst_ie, *premainder_ie =NULL, *pbackup_remainder_ie =NULL; u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
uint offset, ielen, ie_offset, remainder_ielen = 0; uint offset, ielen, ie_offset, remainder_ielen = 0;
u8 *pie = pnetwork->IEs; u8 *pie = pnetwork->IEs;
@ -329,7 +329,7 @@ void expire_timeout_chk(struct adapter *padapter)
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
u8 updated; u8 updated;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 chk_alive_num = 0; u8 chk_alive_num = 0;
char chk_alive_list[NUM_STA]; char chk_alive_list[NUM_STA];
@ -848,7 +848,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
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);
struct HT_info_element *pht_info =NULL; struct HT_info_element *pht_info = NULL;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
@ -998,8 +998,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
{ {
int ret =_SUCCESS; int ret =_SUCCESS;
u8 *p; u8 *p;
u8 *pHT_caps_ie =NULL; u8 *pHT_caps_ie = NULL;
u8 *pHT_info_ie =NULL; u8 *pHT_info_ie = NULL;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
u16 cap, ht_cap =false; u16 cap, ht_cap =false;
uint ie_len = 0; uint ie_len = 0;
@ -1518,7 +1518,7 @@ static void update_bcn_wmm_ie(struct adapter *padapter)
static void update_bcn_wps_ie(struct adapter *padapter) static void update_bcn_wps_ie(struct adapter *padapter)
{ {
u8 *pwps_ie =NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie =NULL; u8 *pwps_ie = NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie = NULL;
uint wps_ielen =0, wps_offset, remainder_ielen; uint wps_ielen =0, wps_offset, remainder_ielen;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1772,7 +1772,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
spin_lock_bh(&pstapriv->asoc_list_lock); spin_lock_bh(&pstapriv->asoc_list_lock);
@ -2328,7 +2328,7 @@ void stop_ap_mode(struct adapter *padapter)
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

6
core/rtw_cmd.c
View file

@ -330,7 +330,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd)
rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz); rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz);
} }
if (pcmd->rsp!=NULL) if (pcmd->rsp!= NULL)
{ {
if (pcmd->rspsz!= 0) if (pcmd->rspsz!= 0)
{ {
@ -461,7 +461,7 @@ post_process:
} }
else else
{ {
/* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!=NULL) */ /* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!= NULL) */
pcmd_callback(pcmd->padapter, pcmd);/* need conider that free cmd_obj in rtw_cmd_callback */ pcmd_callback(pcmd->padapter, pcmd);/* need conider that free cmd_obj in rtw_cmd_callback */
} }
} }
@ -1029,7 +1029,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
psecnetwork =(struct wlan_bssid_ex *)&psecuritypriv->sec_bss; psecnetwork =(struct wlan_bssid_ex *)&psecuritypriv->sec_bss;
if (psecnetwork == NULL) if (psecnetwork == NULL)
{ {
if (pcmd !=NULL) if (pcmd != NULL)
rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj));
res =_FAIL; res =_FAIL;

2
core/rtw_ieee80211.c
View file

@ -858,7 +858,7 @@ u8 *rtw_get_wps_ie_from_scan_queue(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps
u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
{ {
uint cnt; uint cnt;
u8 *wpsie_ptr =NULL; u8 *wpsie_ptr = NULL;
u8 eid, wps_oui[4]={0x0, 0x50, 0xf2, 0x04}; u8 eid, wps_oui[4]={0x0, 0x50, 0xf2, 0x04};
if (wps_ielen) if (wps_ielen)

10
core/rtw_ioctl_set.c
View file

@ -802,8 +802,8 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
pbssid =get_bssid(&padapter->mlmepriv); pbssid =get_bssid(&padapter->mlmepriv);
stainfo =rtw_get_stainfo(&padapter->stapriv, pbssid); stainfo =rtw_get_stainfo(&padapter->stapriv, pbssid);
if ((stainfo!=NULL)&&(padapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)) { if ((stainfo!= NULL)&&(padapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)) {
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY:( stainfo!=NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY:( stainfo!= NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)\n"));
encryptionalgo =stainfo->dot118021XPrivacy; encryptionalgo =stainfo->dot118021XPrivacy;
} }
else { else {
@ -815,7 +815,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11PrivacyAlgrthm ==%d)!\n", padapter->securitypriv.dot11PrivacyAlgrthm)); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11PrivacyAlgrthm ==%d)!\n", padapter->securitypriv.dot11PrivacyAlgrthm));
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11AuthAlgrthm ==%d)!\n", padapter->securitypriv.dot11AuthAlgrthm)); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11AuthAlgrthm ==%d)!\n", padapter->securitypriv.dot11AuthAlgrthm));
if ((stainfo!=NULL)) { if ((stainfo!= NULL)) {
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy ==%d)!\n", stainfo->dot118021XPrivacy)); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy ==%d)!\n", stainfo->dot118021XPrivacy));
} }
@ -1076,7 +1076,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key)
pbssid =get_bssid(&padapter->mlmepriv); pbssid =get_bssid(&padapter->mlmepriv);
stainfo =rtw_get_stainfo(&padapter->stapriv , pbssid ); stainfo =rtw_get_stainfo(&padapter->stapriv , pbssid );
if (stainfo!=NULL) if (stainfo!= NULL)
{ {
memset( &stainfo->dot118021x_UncstKey, 0, 16);/* clear keybuffer */ memset( &stainfo->dot118021x_UncstKey, 0, 16);/* clear keybuffer */
@ -1161,7 +1161,7 @@ u8 rtw_set_802_11_remove_key(struct adapter* padapter, struct ndis_802_11_remove
} else { } else {
pbssid =get_bssid(&padapter->mlmepriv); pbssid =get_bssid(&padapter->mlmepriv);
stainfo =rtw_get_stainfo(&padapter->stapriv , pbssid ); stainfo =rtw_get_stainfo(&padapter->stapriv , pbssid );
if (stainfo !=NULL) { if (stainfo != NULL) {
encryptionalgo =stainfo->dot118021XPrivacy; encryptionalgo =stainfo->dot118021XPrivacy;
/* clear key by BSSID */ /* clear key by BSSID */

2
core/rtw_iol.c
View file

@ -37,7 +37,7 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter)
{ {
DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__); DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__);
rtw_free_xmitframe(pxmitpriv, xmit_frame); rtw_free_xmitframe(pxmitpriv, xmit_frame);
xmit_frame =NULL; xmit_frame = NULL;
goto exit; goto exit;
} }

18
core/rtw_mlme.c
View file

@ -102,7 +102,7 @@ static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen)
if (*ppie) { if (*ppie) {
rtw_mfree(*ppie, *plen); rtw_mfree(*ppie, *plen);
*plen = 0; *plen = 0;
*ppie =NULL; *ppie = NULL;
} }
} }
@ -205,7 +205,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *
spin_lock_bh(&free_queue->lock); spin_lock_bh(&free_queue->lock);
if (_rtw_queue_empty(free_queue) == true) { if (_rtw_queue_empty(free_queue) == true) {
pnetwork =NULL; pnetwork = NULL;
goto exit; goto exit;
} }
plist = get_next(&(free_queue->queue)); plist = get_next(&(free_queue->queue));
@ -324,7 +324,7 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
; ;
if (_rtw_memcmp(zero_addr, addr, ETH_ALEN)) { if (_rtw_memcmp(zero_addr, addr, ETH_ALEN)) {
pnetwork =NULL; pnetwork = NULL;
goto exit; goto exit;
} }
@ -883,7 +883,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS))
{ {
if (rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen)!=NULL) if (rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen)!= NULL)
{ {
return true; return true;
} }
@ -894,7 +894,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
} }
if (adapter->registrypriv.wifi_spec == 1) /* for correct flow of 8021X to do.... */ if (adapter->registrypriv.wifi_spec == 1) /* for correct flow of 8021X to do.... */
{ {
u8 *p =NULL; u8 *p = NULL;
uint ie_len =0; uint ie_len =0;
if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0)) if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0))
@ -1389,7 +1389,7 @@ void rtw_scan_abort(struct adapter *adapter)
static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork) static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork)
{ {
int i; int i;
struct sta_info *bmc_sta, *psta =NULL; struct sta_info *bmc_sta, *psta = NULL;
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -1553,7 +1553,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
/* ptarget_wlan: found from scanned_queue */ /* ptarget_wlan: found from scanned_queue */
/* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check if "ptarget_sta" & "ptarget_wlan" exist. */ /* if join_res > 0, for (fw_state ==WIFI_STATION_STATE), we check if "ptarget_sta" & "ptarget_wlan" exist. */
/* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */ /* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */
/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). */ /* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */
/* */ /* */
/* define REJOIN */ /* define REJOIN */
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
@ -1896,7 +1896,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
int mac_id =-1; int mac_id =-1;
struct sta_info *psta; struct sta_info *psta;
struct wlan_network* pwlan = NULL; struct wlan_network* pwlan = NULL;
struct wlan_bssid_ex *pdev_network =NULL; struct wlan_bssid_ex *pdev_network = NULL;
u8* pibss = NULL; u8* pibss = NULL;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct stadel_event *pstadel = (struct stadel_event*)pbuf; struct stadel_event *pstadel = (struct stadel_event*)pbuf;
@ -2989,7 +2989,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
{ {
u8 issued; u8 issued;
int priority; int priority;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct ht_priv *phtpriv; struct ht_priv *phtpriv;
struct pkt_attrib *pattrib =&pxmitframe->attrib; struct pkt_attrib *pattrib =&pxmitframe->attrib;
s32 bmcst = IS_MCAST(pattrib->ra); s32 bmcst = IS_MCAST(pattrib->ra);

10
core/rtw_mlme_ext.c
View file

@ -1031,7 +1031,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
u16 algorithm; u16 algorithm;
int status; int status;
static struct sta_info stat; static struct sta_info stat;
struct sta_info *pstat =NULL; struct sta_info *pstat = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -2277,7 +2277,7 @@ unsigned int OnAction_dls(struct adapter *padapter, union recv_frame *precv_fram
unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame) unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame)
{ {
u8 *addr; u8 *addr;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
unsigned char *frame_body; unsigned char *frame_body;
unsigned char category, action; unsigned char category, action;
@ -5718,7 +5718,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
/* for P2P : Primary Device Type & Device Name */ /* for P2P : Primary Device Type & Device Name */
u32 wpsielen =0, insert_len =0; u32 wpsielen =0, insert_len =0;
u8 *wpsie =NULL; u8 *wpsie = NULL;
wpsie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wpsielen); wpsie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wpsielen);
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) && wpsie && wpsielen>0) if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO) && wpsie && wpsielen>0)
@ -6024,7 +6024,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
pwps_ie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen); pwps_ie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_, cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
/* inerset & update wps_probe_resp_ie */ /* inerset & update wps_probe_resp_ie */
if ((pmlmepriv->wps_probe_resp_ie!=NULL) && pwps_ie && (wps_ielen>0)) if ((pmlmepriv->wps_probe_resp_ie!= NULL) && pwps_ie && (wps_ielen>0))
{ {
uint wps_offset, remainder_ielen; uint wps_offset, remainder_ielen;
u8 *premainder_ie; u8 *premainder_ie;
@ -10511,7 +10511,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)
unsigned long irqL; unsigned long irqL;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
struct list_head *xmitframe_plist, *xmitframe_phead; struct list_head *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe =NULL; struct xmit_frame *pxmitframe = NULL;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;

8
core/rtw_p2p.c
View file

@ -2243,7 +2243,7 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len, struct sta_info *psta) u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint len, struct sta_info *psta)
{ {
u8 status_code = P2P_STATUS_SUCCESS; u8 status_code = P2P_STATUS_SUCCESS;
u8 *pbuf, *pattr_content =NULL; u8 *pbuf, *pattr_content = NULL;
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
u16 cap_attr =0; u16 cap_attr =0;
unsigned short frame_type, ie_offset =0; unsigned short frame_type, ie_offset =0;
@ -3274,7 +3274,7 @@ static void rtw_change_p2pie_op_ch(struct adapter *padapter, const u8 *frame_bod
/* Check P2P_ATTR_OPERATING_CH */ /* Check P2P_ATTR_OPERATING_CH */
attr_contentlen = 0; attr_contentlen = 0;
pattr = NULL; pattr = NULL;
if ((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL) if ((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!= NULL)
{ {
*(pattr+4) = ch; *(pattr+4) = ch;
} }
@ -3301,7 +3301,7 @@ static void rtw_change_p2pie_ch_list(struct adapter *padapter, const u8 *frame_b
u8 *pattr = NULL; u8 *pattr = NULL;
/* Check P2P_ATTR_CH_LIST */ /* Check P2P_ATTR_CH_LIST */
if ((pattr =rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!=NULL) { if ((pattr =rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!= NULL) {
int i; int i;
u32 num_of_ch; u32 num_of_ch;
u8 *pattr_temp = pattr + 3 ; u8 *pattr_temp = pattr + 3 ;
@ -3466,7 +3466,7 @@ static u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_le
u8 ch_list[40]; u8 ch_list[40];
bool continuous = false; bool continuous = false;
if ((pattr =rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, &attr_contentlen))!=NULL) { if ((pattr =rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, &attr_contentlen))!= NULL) {
int i, j; int i, j;
u32 num_of_ch; u32 num_of_ch;
u8 *pattr_temp = pattr + 3 ; u8 *pattr_temp = pattr + 3 ;

26
core/rtw_recv.c
View file

@ -165,7 +165,7 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
rtw_list_delete(&precvframe->u.hdr.list); rtw_list_delete(&precvframe->u.hdr.list);
padapter =precvframe->u.hdr.adapter; padapter =precvframe->u.hdr.adapter;
if (padapter !=NULL) { if (padapter != NULL) {
precvpriv =&padapter->recvpriv; precvpriv =&padapter->recvpriv;
if (pfree_recv_queue == &precvpriv->free_recv_queue) if (pfree_recv_queue == &precvpriv->free_recv_queue)
precvpriv->free_recvframe_cnt--; precvpriv->free_recvframe_cnt--;
@ -219,7 +219,7 @@ int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv
rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(pfree_recv_queue)); rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(pfree_recv_queue));
if (padapter !=NULL) { if (padapter != NULL) {
if (pfree_recv_queue == &precvpriv->free_recv_queue) if (pfree_recv_queue == &precvpriv->free_recv_queue)
precvpriv->free_recvframe_cnt++; precvpriv->free_recvframe_cnt++;
} }
@ -632,7 +632,7 @@ static union recv_frame * portctrl(struct adapter *adapter, union recv_frame * p
if (auth_alg ==2) if (auth_alg ==2)
{ {
if ((psta!=NULL) && (psta->ieee8021x_blocked)) if ((psta!= NULL) && (psta->ieee8021x_blocked))
{ {
/* blocked */ /* blocked */
/* only accept EAPOL frame */ /* only accept EAPOL frame */
@ -651,7 +651,7 @@ static union recv_frame * portctrl(struct adapter *adapter, union recv_frame * p
else { else {
/* free this frame */ /* free this frame */
rtw_free_recvframe(precv_frame, &adapter->recvpriv.free_recv_queue); rtw_free_recvframe(precv_frame, &adapter->recvpriv.free_recv_queue);
prtnframe =NULL; prtnframe = NULL;
} }
} }
else else
@ -734,7 +734,7 @@ void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
psta = rtw_get_stainfo(pstapriv, pattrib->src); psta = rtw_get_stainfo(pstapriv, pattrib->src);
@ -778,7 +778,7 @@ void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame)
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
psta = rtw_get_stainfo(pstapriv, pattrib->src); psta = rtw_get_stainfo(pstapriv, pattrib->src);
@ -1241,7 +1241,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
{ {
u16 aid; u16 aid;
u8 wmmps_ac =0; u8 wmmps_ac =0;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
aid = GetAid(pframe); aid = GetAid(pframe);
psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
@ -1289,7 +1289,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *xmitframe_plist, *xmitframe_phead; struct list_head *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe =NULL; struct xmit_frame *pxmitframe = NULL;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
/* spin_lock_bh(&psta->sleep_q.lock); */ /* spin_lock_bh(&psta->sleep_q.lock); */
@ -2099,14 +2099,14 @@ union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_fram
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Enqueuq: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum)); RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Enqueuq: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
prtnframe =NULL; prtnframe = NULL;
} }
else else
{ {
/* can't find this ta's defrag_queue, so free this recv_frame */ /* can't find this ta's defrag_queue, so free this recv_frame */
rtw_free_recvframe(precv_frame, pfree_recv_queue); rtw_free_recvframe(precv_frame, pfree_recv_queue);
prtnframe =NULL; prtnframe = NULL;
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum)); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
} }
@ -2133,21 +2133,21 @@ union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_fram
{ {
/* can't find this ta's defrag_queue, so free this recv_frame */ /* can't find this ta's defrag_queue, so free this recv_frame */
rtw_free_recvframe(precv_frame, pfree_recv_queue); rtw_free_recvframe(precv_frame, pfree_recv_queue);
prtnframe =NULL; prtnframe = NULL;
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum)); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
} }
} }
if ((prtnframe!=NULL)&&(prtnframe->u.hdr.attrib.privacy)) if ((prtnframe!= NULL)&&(prtnframe->u.hdr.attrib.privacy))
{ {
/* after defrag we must check tkip mic code */ /* after defrag we must check tkip mic code */
if (recvframe_chkmic(padapter, prtnframe) ==_FAIL) if (recvframe_chkmic(padapter, prtnframe) ==_FAIL)
{ {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic(padapter, prtnframe) ==_FAIL\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic(padapter, prtnframe) ==_FAIL\n"));
rtw_free_recvframe(prtnframe, pfree_recv_queue); rtw_free_recvframe(prtnframe, pfree_recv_queue);
prtnframe =NULL; prtnframe = NULL;
} }
} }

16
core/rtw_security.c
View file

@ -666,7 +666,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] ); stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
} }
if (stainfo!=NULL) { if (stainfo!= NULL) {
if (!(stainfo->state &_FW_LINKED)) if (!(stainfo->state &_FW_LINKED))
{ {
@ -674,7 +674,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
return _FAIL; return _FAIL;
} }
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo!=NULL!!!\n")); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo!= NULL!!!\n"));
if (IS_MCAST(pattrib->ra)) if (IS_MCAST(pattrib->ra))
{ {
@ -765,7 +765,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
if (prxattrib->encrypt ==_TKIP_) { if (prxattrib->encrypt ==_TKIP_) {
stainfo =rtw_get_stainfo(&padapter->stapriv ,&prxattrib->ta[0] ); stainfo =rtw_get_stainfo(&padapter->stapriv ,&prxattrib->ta[0] );
if (stainfo!=NULL) { if (stainfo!= NULL) {
if (IS_MCAST(prxattrib->ra)) if (IS_MCAST(prxattrib->ra))
{ {
@ -812,7 +812,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
} }
else else
{ {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt: stainfo!=NULL!!!\n")); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt: stainfo!= NULL!!!\n"));
prwskey =&stainfo->dot118021x_UncstKey.skey[0]; prwskey =&stainfo->dot118021x_UncstKey.skey[0];
prwskeylen =16; prwskeylen =16;
} }
@ -1560,13 +1560,13 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] ); stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
} }
if (stainfo!=NULL) { if (stainfo!= NULL) {
if (!(stainfo->state &_FW_LINKED)) { if (!(stainfo->state &_FW_LINKED)) {
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state); DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
return _FAIL; return _FAIL;
} }
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo!=NULL!!!\n")); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo!= NULL!!!\n"));
if (IS_MCAST(pattrib->ra)) if (IS_MCAST(pattrib->ra))
prwskey =psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; prwskey =psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
@ -1875,8 +1875,8 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
/* 4 start to encrypt each fragment */ /* 4 start to encrypt each fragment */
if ((prxattrib->encrypt ==_AES_)) { if ((prxattrib->encrypt ==_AES_)) {
stainfo =rtw_get_stainfo(&padapter->stapriv ,&prxattrib->ta[0] ); stainfo =rtw_get_stainfo(&padapter->stapriv ,&prxattrib->ta[0] );
if (stainfo!=NULL) { if (stainfo!= NULL) {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_decrypt: stainfo!=NULL!!!\n")); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_decrypt: stainfo!= NULL!!!\n"));
if (IS_MCAST(prxattrib->ra)) { if (IS_MCAST(prxattrib->ra)) {
static u32 start = 0; static u32 start = 0;

2
core/rtw_sta_mgt.c
View file

@ -582,7 +582,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
{ /* if found the matched address */ { /* if found the matched address */
break; break;
} }
psta =NULL; psta = NULL;
plist = get_next(plist); plist = get_next(plist);
} }

16
core/rtw_xmit.c
View file

@ -114,7 +114,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxmitpriv->pallocated_frame_buf = rtw_zvmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4); pxmitpriv->pallocated_frame_buf = rtw_zvmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4);
if (pxmitpriv->pallocated_frame_buf == NULL) { if (pxmitpriv->pallocated_frame_buf == NULL) {
pxmitpriv->pxmit_frame_buf =NULL; pxmitpriv->pxmit_frame_buf = NULL;
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_frame fail!\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_frame fail!\n"));
res = _FAIL; res = _FAIL;
goto exit; goto exit;
@ -1464,7 +1464,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
struct pkt_file pktfile; struct pkt_file pktfile;
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz; s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
SIZE_PTR addr; SIZE_PTR addr;
u8 *pframe, *mem_start = NULL, *tmp_buf =NULL; u8 *pframe, *mem_start = NULL, *tmp_buf = NULL;
u8 hw_hdr_offset, subtype ; u8 hw_hdr_offset, subtype ;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1473,7 +1473,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
s32 bmcst = IS_MCAST(pattrib->ra); s32 bmcst = IS_MCAST(pattrib->ra);
s32 res = _FAIL; s32 res = _FAIL;
u8 *BIP_AAD; u8 *BIP_AAD;
u8 *MGMT_body =NULL; u8 *MGMT_body = NULL;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2185,7 +2185,7 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram
static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, struct __queue *pframe_queue) static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, struct __queue *pframe_queue)
{ {
struct list_head *xmitframe_plist, *xmitframe_phead; struct list_head *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe =NULL; struct xmit_frame *pxmitframe = NULL;
xmitframe_phead = get_list_head(pframe_queue); xmitframe_phead = get_list_head(pframe_queue);
xmitframe_plist = get_next(xmitframe_phead); xmitframe_plist = get_next(xmitframe_phead);
@ -2270,7 +2270,7 @@ exit:
struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac) struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac)
{ {
struct tx_servq *ptxservq =NULL; struct tx_servq *ptxservq = NULL;
; ;
@ -2751,7 +2751,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe) sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
sint ret =false; sint ret =false;
struct sta_info *psta =NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2982,7 +2982,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
u8 update_mask =0, wmmps_ac =0; u8 update_mask =0, wmmps_ac =0;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
struct list_head *xmitframe_plist, *xmitframe_phead; struct list_head *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe =NULL; struct xmit_frame *pxmitframe = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -3148,7 +3148,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst
{ {
u8 wmmps_ac =0; u8 wmmps_ac =0;
struct list_head *xmitframe_plist, *xmitframe_phead; struct list_head *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe =NULL; struct xmit_frame *pxmitframe = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

2
hal/Hal8188ERateAdaptive.c
View file

@ -622,7 +622,7 @@ ODM_RAInfo_Init(
PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID]; PODM_RA_INFO_T pRaInfo = &pDM_Odm->RAInfo[MacID];
u8 WirelessMode=0xFF; /* invalid value */ u8 WirelessMode=0xFF; /* invalid value */
u8 max_rate_idx = 0x13; /* MCS7 */ u8 max_rate_idx = 0x13; /* MCS7 */
if (pDM_Odm->pWirelessMode!=NULL) { if (pDM_Odm->pWirelessMode!= NULL) {
WirelessMode=*(pDM_Odm->pWirelessMode); WirelessMode=*(pDM_Odm->pWirelessMode);
} }

2
hal/rtl8188e_phycfg.c
View file

@ -1049,7 +1049,7 @@ phy_BB8188E_Config_ParaFile(
u8 sz8188EBBRegPgFile[] = RTL8188E_PHY_REG_PG; u8 sz8188EBBRegPgFile[] = RTL8188E_PHY_REG_PG;
u8 sz8188EBBRegMpFile[] = RTL8188E_PHY_REG_MP; u8 sz8188EBBRegMpFile[] = RTL8188E_PHY_REG_MP;
u8 *pszBBRegFile = NULL, *pszAGCTableFile = NULL, *pszBBRegPgFile = NULL, *pszBBRegMpFile=NULL; u8 *pszBBRegFile = NULL, *pszAGCTableFile = NULL, *pszBBRegPgFile = NULL, *pszBBRegMpFile= NULL;
/* RT_TRACE(COMP_INIT, DBG_TRACE, ("==>phy_BB8192S_Config_ParaFile\n")); */ /* RT_TRACE(COMP_INIT, DBG_TRACE, ("==>phy_BB8192S_Config_ParaFile\n")); */

4
hal/rtl8188eu_recv.c
View file

@ -122,7 +122,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
int i; int i;
SIZE_PTR tmpaddr=0; SIZE_PTR tmpaddr=0;
SIZE_PTR alignment=0; SIZE_PTR alignment=0;
struct sk_buff *pskb=NULL; struct sk_buff *pskb= NULL;
skb_queue_head_init(&precvpriv->free_recv_skb_queue); skb_queue_head_init(&precvpriv->free_recv_skb_queue);
@ -141,7 +141,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb); skb_queue_tail(&precvpriv->free_recv_skb_queue, pskb);
} }
pskb=NULL; pskb= NULL;
} }
} }

2
include/wifi.h
View file

@ -436,7 +436,7 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe)
sa = GetAddr1Ptr(pframe); sa = GetAddr1Ptr(pframe);
break; break;
default: default:
sa =NULL; /* */ sa = NULL; /* */
break; break;
} }

14
os_dep/ioctl_cfg80211.c
View file

@ -350,12 +350,12 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
/* To reduce PBC Overlap rate */ /* To reduce PBC Overlap rate */
if (wdev_to_priv(wdev)->scan_request != NULL) if (wdev_to_priv(wdev)->scan_request != NULL)
{ {
u8 *psr=NULL, sr = 0; u8 *psr= NULL, sr = 0;
struct ndis_802_11_ssid *pssid = &pnetwork->network.Ssid; struct ndis_802_11_ssid *pssid = &pnetwork->network.Ssid;
struct cfg80211_scan_request *request = wdev_to_priv(wdev)->scan_request; struct cfg80211_scan_request *request = wdev_to_priv(wdev)->scan_request;
struct cfg80211_ssid *ssids = request->ssids; struct cfg80211_ssid *ssids = request->ssids;
u32 wpsielen=0; u32 wpsielen=0;
u8 *wpsie=NULL; u8 *wpsie= NULL;
wpsie = rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wpsielen); wpsie = rtw_get_wps_ie(pnetwork->network.IEs+_FIXED_IE_LENGTH_, pnetwork->network.IELength-_FIXED_IE_LENGTH_, NULL, &wpsielen);
@ -377,7 +377,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
} }
else else
{ {
if (psr !=NULL) if (psr != NULL)
*psr = 0; /* clear sr */ *psr = 0; /* clear sr */
} }
@ -521,7 +521,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter)
pnetwork->Ssid.SsidLength, pnetwork->Ssid.SsidLength,
WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
return (bss!=NULL); return (bss!= NULL);
} }
void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
@ -1957,9 +1957,9 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT]; struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT]; struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
unsigned long irqL; unsigned long irqL;
u8 *wps_ie=NULL; u8 *wps_ie= NULL;
uint wps_ielen=0; uint wps_ielen=0;
u8 *p2p_ie=NULL; u8 *p2p_ie= NULL;
uint p2p_ielen=0; uint p2p_ielen=0;
u8 survey_times=3; u8 survey_times=3;
u8 survey_times_for_one_ch=6; u8 survey_times_for_one_ch=6;
@ -2234,7 +2234,7 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key
static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t ielen) static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t ielen)
{ {
u8 *buf=NULL, *pos=NULL; u8 *buf= NULL, *pos= NULL;
u32 left; u32 left;
int group_cipher = 0, pairwise_cipher = 0; int group_cipher = 0, pairwise_cipher = 0;
int ret = 0; int ret = 0;

6
os_dep/ioctl_linux.c
View file

@ -501,7 +501,7 @@ static char *translate_scan(struct adapter *padapter,
{ /* parsing WPS IE */ { /* parsing WPS IE */
uint cnt = 0,total_ielen; uint cnt = 0,total_ielen;
u8 *wpsie_ptr=NULL; u8 *wpsie_ptr= NULL;
uint wps_ielen = 0; uint wps_ielen = 0;
u8 *ie_ptr = pnetwork->network.IEs +_FIXED_IE_LENGTH_; u8 *ie_ptr = pnetwork->network.IEs +_FIXED_IE_LENGTH_;
@ -840,7 +840,7 @@ exit:
static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ielen) static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ielen)
{ {
u8 *buf=NULL, *pos=NULL; u8 *buf= NULL, *pos= NULL;
u32 left; u32 left;
int group_cipher = 0, pairwise_cipher = 0; int group_cipher = 0, pairwise_cipher = 0;
int ret = 0; int ret = 0;
@ -3907,7 +3907,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) { if (!blnMatch) {
sprintf(go_devadd_str, "\n\ndev_add=NULL"); sprintf(go_devadd_str, "\n\ndev_add= NULL");
} else { } else {
sprintf(go_devadd_str, "\n\ndev_add=%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", sprintf(go_devadd_str, "\n\ndev_add=%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
attr_content[0], attr_content[1], attr_content[2], attr_content[3], attr_content[4], attr_content[5]); attr_content[0], attr_content[1], attr_content[2], attr_content[3], attr_content[4], attr_content[5]);

4
os_dep/osdep_service.c
View file

@ -90,7 +90,7 @@ inline void _rtw_vmfree(u8 *pbuf, u32 sz)
u8* _rtw_malloc(u32 sz) u8* _rtw_malloc(u32 sz)
{ {
u8 *pbuf=NULL; u8 *pbuf= NULL;
pbuf = kmalloc(sz,in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); pbuf = kmalloc(sz,in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
@ -893,7 +893,7 @@ static int openFile(struct file **fpp, char *path, int flag, int mode)
fp=filp_open(path, flag, mode); fp=filp_open(path, flag, mode);
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
*fpp=NULL; *fpp= NULL;
return PTR_ERR(fp); return PTR_ERR(fp);
} }
else { else {

2
os_dep/recv_linux.c
View file

@ -234,7 +234,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{ {
struct sk_buff *pskb2=NULL; struct sk_buff *pskb2= NULL;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;

2
os_dep/usb_intf.c
View file

@ -1304,7 +1304,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
rtw_sw_export=NULL; rtw_sw_export= NULL;
#endif #endif
; ;