skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-24 05:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove cases of two or more blank lines

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-01 18:00:05 -06:00
parent e91077579f
commit bad0b4cde4
91 changed files with 1 additions and 1098 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/rtw_ap.c
View file

@ -32,7 +32,6 @@ void init_mlme_ap_info(struct adapter *padapter)
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
spin_lock_init(&pmlmepriv->bcn_update_lock); spin_lock_init(&pmlmepriv->bcn_update_lock);
/* for ACL */ /* for ACL */
@ -634,7 +633,6 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
else else
psta->ieee8021x_blocked = false; psta->ieee8021x_blocked = false;
/* update sta's cap */ /* update sta's cap */
/* ERP */ /* ERP */
@ -732,7 +730,6 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
cur_bwmode = HT_CHANNEL_WIDTH_20; cur_bwmode = HT_CHANNEL_WIDTH_20;
cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
/* check if there is wps ie, */ /* check if there is wps ie, */
/* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */ /* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */
/* and at first time the security ie (RSN/WPA IE) will not include in beacon. */ /* and at first time the security ie (RSN/WPA IE) will not include in beacon. */
@ -880,7 +877,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
return _FAIL; return _FAIL;
if (len > MAX_IE_SZ) if (len > MAX_IE_SZ)
return _FAIL; return _FAIL;
@ -890,7 +886,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
memcpy(ie, pbuf, pbss_network->IELength); memcpy(ie, pbuf, pbss_network->IELength);
if (pbss_network->InfrastructureMode != Ndis802_11APMode) if (pbss_network->InfrastructureMode != Ndis802_11APMode)
return _FAIL; return _FAIL;
@ -1741,7 +1736,6 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta,
/* clear cam entry / key */ /* clear cam entry / key */
rtw_clearstakey_cmd(padapter, (u8 *)psta, (u8)(psta->mac_id + 3), true); rtw_clearstakey_cmd(padapter, (u8 *)psta, (u8)(psta->mac_id + 3), true);
spin_lock_bh(&psta->lock); spin_lock_bh(&psta->lock);
psta->state &= ~_FW_LINKED; psta->state &= ~_FW_LINKED;
spin_unlock_bh(&psta->lock); spin_unlock_bh(&psta->lock);
@ -1826,7 +1820,6 @@ int rtw_sta_flush(struct adapter *padapter)
} }
spin_unlock_bh(&pstapriv->asoc_list_lock); spin_unlock_bh(&pstapriv->asoc_list_lock);
issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING);
associated_clients_update(padapter, true); associated_clients_update(padapter, true);

8
core/rtw_br_ext.c
View file

@ -64,7 +64,6 @@
PPPoE |type| SID | AC MAC | PPPoE |type| SID | AC MAC |
-----------------------------------------------------------------*/ -----------------------------------------------------------------*/
/* Find a tag in pppoe frame and return the pointer */ /* Find a tag in pppoe frame and return the pointer */
static inline unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsigned short type) static inline unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsigned short type)
{ {
@ -83,7 +82,6 @@ static inline unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsign
return NULL; return NULL;
} }
static inline int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag) static inline int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag)
{ {
struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN);
@ -133,7 +131,6 @@ static inline unsigned long __nat25_timeout(struct adapter *priv)
return timeout; return timeout;
} }
static inline int __nat25_has_expired(struct adapter *priv, static inline int __nat25_has_expired(struct adapter *priv,
struct nat25_network_db_entry *fdb) struct nat25_network_db_entry *fdb)
{ {
@ -143,7 +140,6 @@ static inline int __nat25_has_expired(struct adapter *priv,
return 0; return 0;
} }
static inline void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr, static inline void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr,
unsigned int *ipAddr) unsigned int *ipAddr)
{ {
@ -153,7 +149,6 @@ static inline void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr
memcpy(networkAddr+7, (unsigned char *)ipAddr, 4); memcpy(networkAddr+7, (unsigned char *)ipAddr, 4);
} }
static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr, static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr) unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
{ {
@ -164,7 +159,6 @@ static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *ne
memcpy(networkAddr+5, ipxNodeAddr, 6); memcpy(networkAddr+5, ipxNodeAddr, 6);
} }
static inline void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr, static inline void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr) unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
{ {
@ -175,7 +169,6 @@ static inline void __nat25_generate_ipx_network_addr_with_socket(unsigned char *
memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2); memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2);
} }
static inline void __nat25_generate_apple_network_addr(unsigned char *networkAddr, static inline void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
unsigned short *network, unsigned char *node) unsigned short *network, unsigned char *node)
{ {
@ -1169,7 +1162,6 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
} }
} }
void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
unsigned char *ipAddr) unsigned char *ipAddr)
{ {

146
core/rtw_cmd.c
View file

@ -36,13 +36,10 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv)
{ {
int res = _SUCCESS; int res = _SUCCESS;
_rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0); _rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0);
/* _rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); */ /* _rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); */
_rtw_init_sema(&(pcmdpriv->terminate_cmdthread_sema), 0); _rtw_init_sema(&(pcmdpriv->terminate_cmdthread_sema), 0);
_rtw_init_queue(&(pcmdpriv->cmd_queue)); _rtw_init_queue(&(pcmdpriv->cmd_queue));
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
@ -81,8 +78,6 @@ int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
{ {
int res = _SUCCESS; int res = _SUCCESS;
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
ATOMIC_SET(&pevtpriv->event_seq, 0); ATOMIC_SET(&pevtpriv->event_seq, 0);
pevtpriv->evt_done_cnt = 0; pevtpriv->evt_done_cnt = 0;
@ -91,15 +86,12 @@ int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
pevtpriv->c2h_wk_alive = false; pevtpriv->c2h_wk_alive = false;
pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1); pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1);
return res; return res;
} }
void rtw_free_evt_priv(struct evt_priv *pevtpriv) void rtw_free_evt_priv(struct evt_priv *pevtpriv)
{ {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n"));
_cancel_workitem_sync(&pevtpriv->c2h_wk); _cancel_workitem_sync(&pevtpriv->c2h_wk);
@ -113,13 +105,11 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv)
} }
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-rtw_free_evt_priv\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-rtw_free_evt_priv\n"));
} }
void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv)
{ {
if (pcmdpriv) { if (pcmdpriv) {
_rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock)); _rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock));
_rtw_free_sema(&(pcmdpriv->cmd_queue_sema)); _rtw_free_sema(&(pcmdpriv->cmd_queue_sema));
@ -148,7 +138,6 @@ int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
{ {
unsigned long flags; unsigned long flags;
if (obj == NULL) if (obj == NULL)
goto exit; goto exit;
@ -160,8 +149,6 @@ int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
exit: exit:
return _SUCCESS; return _SUCCESS;
} }
@ -170,8 +157,6 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
struct cmd_obj *obj; struct cmd_obj *obj;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&queue->lock, flags); spin_lock_irqsave(&queue->lock, flags);
if (rtw_is_list_empty(&(queue->queue))) { if (rtw_is_list_empty(&(queue->queue))) {
obj = NULL; obj = NULL;
@ -182,8 +167,6 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
spin_unlock_irqrestore(&queue->lock, flags); spin_unlock_irqrestore(&queue->lock, flags);
return obj; return obj;
} }
@ -241,8 +224,6 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
int res = _FAIL; int res = _FAIL;
struct adapter *padapter = pcmdpriv->padapter; struct adapter *padapter = pcmdpriv->padapter;
if (cmd_obj == NULL) if (cmd_obj == NULL)
goto exit; goto exit;
@ -261,8 +242,6 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
exit: exit:
return res; return res;
} }
@ -270,11 +249,8 @@ struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
{ {
struct cmd_obj *cmd_obj; struct cmd_obj *cmd_obj;
cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue); cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
return cmd_obj; return cmd_obj;
} }
@ -289,7 +265,6 @@ void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv)
void rtw_free_cmd_obj(struct cmd_obj *pcmd) void rtw_free_cmd_obj(struct cmd_obj *pcmd)
{ {
if ((pcmd->cmdcode != _JoinBss_CMD_) && (pcmd->cmdcode != _CreateBss_CMD_)) { if ((pcmd->cmdcode != _JoinBss_CMD_) && (pcmd->cmdcode != _CreateBss_CMD_)) {
/* free parmbuf in cmd_obj */ /* free parmbuf in cmd_obj */
kfree(pcmd->parmbuf); kfree(pcmd->parmbuf);
@ -305,7 +280,6 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd)
/* free cmd_obj */ /* free cmd_obj */
kfree(pcmd); kfree(pcmd);
} }
int rtw_cmd_thread(void *context) int rtw_cmd_thread(void *context)
@ -318,8 +292,6 @@ int rtw_cmd_thread(void *context)
struct adapter *padapter = (struct adapter *)context; struct adapter *padapter = (struct adapter *)context;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
thread_enter("RTW_CMD_THREAD"); thread_enter("RTW_CMD_THREAD");
pcmdbuf = pcmdpriv->cmd_buf; pcmdbuf = pcmdpriv->cmd_buf;
@ -413,8 +385,6 @@ post_process:
_rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);
thread_exit(); thread_exit();
} }
@ -426,8 +396,6 @@ u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
ret = _FAIL; ret = _FAIL;
@ -449,8 +417,6 @@ u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
exit: exit:
return ret; return ret;
} }
@ -468,7 +434,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
} }
@ -540,8 +505,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
} }
return res; return res;
} }
@ -552,8 +515,6 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -573,8 +534,6 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
return res; return res;
} }
@ -585,8 +544,6 @@ u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -607,12 +564,9 @@ u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
return res; return res;
} }
/* /*
unsigned char rtw_setphy_cmd(unsigned char *adapter) unsigned char rtw_setphy_cmd(unsigned char *adapter)
@ -627,8 +581,6 @@ u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -662,7 +614,6 @@ u8 rtw_setbbreg_cmd(struct adapter *padapter, u8 offset, u8 val)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -694,7 +645,6 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -760,8 +710,6 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -788,8 +736,6 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
exit: exit:
return res; return res;
} }
@ -825,8 +771,6 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network; struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;
u8 res = _SUCCESS; u8 res = _SUCCESS;
rtw_led_control(padapter, LED_CTL_START_TO_LINK); rtw_led_control(padapter, LED_CTL_START_TO_LINK);
if (pmlmepriv->assoc_ssid.SsidLength == 0) if (pmlmepriv->assoc_ssid.SsidLength == 0)
@ -850,8 +794,6 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
res = rtw_enqueue_cmd(pcmdpriv, pcmd); res = rtw_enqueue_cmd(pcmdpriv, pcmd);
exit: exit:
return res; return res;
} }
@ -861,8 +803,6 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
res = _FAIL; res = _FAIL;
@ -880,8 +820,6 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned
exit: exit:
return res; return res;
} }
@ -901,8 +839,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
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);
rtw_led_control(padapter, LED_CTL_START_TO_LINK); rtw_led_control(padapter, LED_CTL_START_TO_LINK);
if (pmlmepriv->assoc_ssid.SsidLength == 0) { if (pmlmepriv->assoc_ssid.SsidLength == 0) {
@ -920,7 +856,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
/* for IEs is fix buf size */ /* for IEs is fix buf size */
t_len = sizeof(struct wlan_bssid_ex); t_len = sizeof(struct wlan_bssid_ex);
/* for hidden ap to set fw_state here */ /* for hidden ap to set fw_state here */
if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE)) { if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE)) {
switch (ndis_network_mode) { switch (ndis_network_mode) {
@ -972,7 +907,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength); psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength);
pqospriv->qos_option = 0; pqospriv->qos_option = 0;
if (pregistrypriv->wmm_enable) { if (pregistrypriv->wmm_enable) {
@ -1023,8 +957,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
exit: exit:
return res; return res;
} }
@ -1035,8 +967,6 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
struct cmd_priv *cmdpriv = &padapter->cmdpriv; struct cmd_priv *cmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));
/* prepare cmd parameter */ /* prepare cmd parameter */
@ -1066,8 +996,6 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
exit: exit:
return res; return res;
} }
@ -1079,8 +1007,6 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = false; res = false;
@ -1101,8 +1027,6 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n
exit: exit:
return res; return res;
} }
@ -1118,8 +1042,6 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)
struct sta_info *sta = (struct sta_info *)psta; struct sta_info *sta = (struct sta_info *)psta;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1164,8 +1086,6 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)
exit: exit:
return res; return res;
} }
@ -1178,8 +1098,6 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
struct sta_info *sta = (struct sta_info *)psta; struct sta_info *sta = (struct sta_info *)psta;
u8 res = _SUCCESS; u8 res = _SUCCESS;
if (!enqueue) { if (!enqueue) {
clear_cam_entry(padapter, entry); clear_cam_entry(padapter, entry);
} else { } else {
@ -1218,8 +1136,6 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
} }
exit: exit:
return res; return res;
} }
@ -1230,7 +1146,6 @@ u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_tab
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1261,7 +1176,6 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1301,8 +1215,6 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1333,8 +1245,6 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
exit: exit:
return res; return res;
} }
@ -1345,8 +1255,6 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
struct addBaReq_parm *paddbareq_parm; struct addBaReq_parm *paddbareq_parm;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1372,8 +1280,6 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
exit: exit:
return res; return res;
} }
@ -1384,8 +1290,6 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1405,7 +1309,6 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
@ -1421,8 +1324,6 @@ u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enque
u8 res = _SUCCESS; u8 res = _SUCCESS;
DBG_88E(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n", DBG_88E(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset); FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset);
@ -1463,8 +1364,6 @@ exit:
DBG_88E(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res); DBG_88E(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res);
return res; return res;
} }
@ -1476,8 +1375,6 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)
u8 res = _SUCCESS; u8 res = _SUCCESS;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n"));
/* check input parameter */ /* check input parameter */
@ -1519,8 +1416,6 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)
exit: exit:
return res; return res;
} }
@ -1532,8 +1427,6 @@ u8 rtw_led_blink_cmd(struct adapter *padapter, struct LED_871x *pLed)
u8 res = _SUCCESS; u8 res = _SUCCESS;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n"));
pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
@ -1556,8 +1449,6 @@ u8 rtw_led_blink_cmd(struct adapter *padapter, struct LED_871x *pLed)
exit: exit:
return res; return res;
} }
@ -1569,8 +1460,6 @@ u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no)
u8 res = _SUCCESS; u8 res = _SUCCESS;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n"));
pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
@ -1593,8 +1482,6 @@ u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no)
exit: exit:
return res; return res;
} }
@ -1688,8 +1575,6 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 mstatus; u8 mstatus;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true))
return; return;
@ -1727,7 +1612,6 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
break; break;
} }
} }
u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
@ -1738,8 +1622,6 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
/* struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; */ /* struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; */
u8 res = _SUCCESS; u8 res = _SUCCESS;
/* if (!pwrctrlpriv->bLeisurePs) */ /* if (!pwrctrlpriv->bLeisurePs) */
/* return res; */ /* return res; */
@ -1770,8 +1652,6 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
exit: exit:
return res; return res;
} }
@ -1788,7 +1668,6 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)
u8 res = _SUCCESS; u8 res = _SUCCESS;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1809,8 +1688,6 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
return res; return res;
} }
@ -1827,7 +1704,6 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
u8 support_ant_div; u8 support_ant_div;
u8 res = _SUCCESS; u8 res = _SUCCESS;
rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_div); rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_div);
if (!support_ant_div) if (!support_ant_div)
return res; return res;
@ -1857,8 +1733,6 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
} }
exit: exit:
return res; return res;
} }
@ -1876,8 +1750,6 @@ u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return res; return res;
@ -1904,8 +1776,6 @@ u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
exit: exit:
return res; return res;
} }
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
@ -1918,7 +1788,6 @@ u8 rtw_ps_cmd(struct adapter *padapter)
u8 res = _SUCCESS; u8 res = _SUCCESS;
ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ppscmd == NULL) { if (ppscmd == NULL) {
res = _FAIL; res = _FAIL;
@ -1940,8 +1809,6 @@ u8 rtw_ps_cmd(struct adapter *padapter)
exit: exit:
return res; return res;
} }
@ -2177,8 +2044,6 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (pcmd->res == H2C_DROPPED) { if (pcmd->res == H2C_DROPPED) {
/* TODO: cancel timer and do timeout handler directly... */ /* TODO: cancel timer and do timeout handler directly... */
/* need to make timeout handlerOS independent */ /* need to make timeout handlerOS independent */
@ -2191,7 +2056,6 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
/* free cmd */ /* free cmd */
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
} }
void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
@ -2215,8 +2079,6 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (pcmd->res == H2C_DROPPED) { if (pcmd->res == H2C_DROPPED) {
/* TODO: cancel timer and do timeout handler directly... */ /* TODO: cancel timer and do timeout handler directly... */
/* need to make timeout handlerOS independent */ /* need to make timeout handlerOS independent */
@ -2238,8 +2100,6 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf; struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network); struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
if ((pcmd->res != H2C_SUCCESS)) { if ((pcmd->res != H2C_SUCCESS)) {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n.")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n."));
_set_timer(&pmlmepriv->assoc_timer, 1); _set_timer(&pmlmepriv->assoc_timer, 1);
@ -2293,7 +2153,6 @@ createbss_cmd_fail:
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
} }
void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd)
@ -2302,8 +2161,6 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc
struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp); struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);
struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr); struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);
if (psta == NULL) { if (psta == NULL) {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));
goto exit; goto exit;
@ -2321,8 +2178,6 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *
struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp); struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);
struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr); struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);
if (psta == NULL) { if (psta == NULL) {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n"));
goto exit; goto exit;
@ -2342,5 +2197,4 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *
exit: exit:
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
} }

4
core/rtw_debug.c
View file

@ -521,7 +521,6 @@ int proc_get_rf_reg_dump3(char *page, char **start,
return len; return len;
} }
int proc_get_rf_reg_dump4(char *page, char **start, int proc_get_rf_reg_dump4(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data) int *eof, void *data)
@ -547,8 +546,6 @@ int proc_get_rf_reg_dump4(char *page, char **start,
return len; return len;
} }
int proc_get_rx_signal(char *page, char **start, int proc_get_rx_signal(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data) int *eof, void *data)
@ -844,7 +841,6 @@ int proc_get_all_sta_info(char *page, char **start,
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
int len = 0; int len = 0;
len += snprintf(page + len, count - len, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap); len += snprintf(page + len, count - len, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap);
spin_lock_bh(&pstapriv->sta_hash_lock); spin_lock_bh(&pstapriv->sta_hash_lock);

3
core/rtw_efuse.c
View file

@ -23,8 +23,6 @@
#include <drv_types.h> #include <drv_types.h>
#include <rtw_efuse.h> #include <rtw_efuse.h>
/*------------------------Define local variable------------------------------*/ /*------------------------Define local variable------------------------------*/
u8 fakeEfuseBank; u8 fakeEfuseBank;
u32 fakeEfuseUsedBytes; u32 fakeEfuseUsedBytes;
@ -377,7 +375,6 @@ int Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *dat
return ret; return ret;
} }
static int Efuse_PgPacketWrite_BT(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, bool pseudo) static int Efuse_PgPacketWrite_BT(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, bool pseudo)
{ {
int ret; int ret;

15
core/rtw_ieee80211.c
View file

@ -69,7 +69,6 @@ static u8 WIFI_OFDMRATES[] = {
IEEE80211_OFDM_RATE_54MB IEEE80211_OFDM_RATE_54MB
}; };
int rtw_get_bit_value_from_ieee_value(u8 val) int rtw_get_bit_value_from_ieee_value(u8 val)
{ {
unsigned char dot11_rate_table[] = { unsigned char dot11_rate_table[] = {
@ -157,7 +156,6 @@ u8 *rtw_set_ie
*frlen = *frlen + (len + 2); *frlen = *frlen + (len + 2);
return pbuf + len + 2; return pbuf + len + 2;
} }
@ -263,7 +261,6 @@ u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, u
uint cnt; uint cnt;
u8 *target_ie = NULL; u8 *target_ie = NULL;
if (ielen) if (ielen)
*ielen = 0; *ielen = 0;
@ -340,7 +337,6 @@ exit:
void rtw_set_supported_rate(u8 *SupportedRates, uint mode) void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
{ {
_rtw_memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX); _rtw_memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);
switch (mode) { switch (mode) {
@ -386,8 +382,6 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
u8 *ie = pdev_network->IEs; u8 *ie = pdev_network->IEs;
/* timestamp will be inserted by hardware */ /* timestamp will be inserted by hardware */
sz += 8; sz += 8;
ie += sz; ie += sz;
@ -445,7 +439,6 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
if (rateLen > 8) if (rateLen > 8)
ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);
return sz; return sz;
} }
@ -527,7 +520,6 @@ int rtw_get_wpa2_cipher_suite(u8 *s)
return 0; return 0;
} }
int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x) int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x)
{ {
int i, ret = _SUCCESS; int i, ret = _SUCCESS;
@ -540,7 +532,6 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
return _FAIL; return _FAIL;
} }
if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) || if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) ||
(_rtw_memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN) != true)) (_rtw_memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN) != true))
return _FAIL; return _FAIL;
@ -550,7 +541,6 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
pos += 8; pos += 8;
left = wpa_ie_len - 8; left = wpa_ie_len - 8;
/* group_cipher */ /* group_cipher */
if (left >= WPA_SELECTOR_LEN) { if (left >= WPA_SELECTOR_LEN) {
*group_cipher = rtw_get_wpa_cipher_suite(pos); *group_cipher = rtw_get_wpa_cipher_suite(pos);
@ -609,7 +599,6 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
return _FAIL; return _FAIL;
} }
if ((*rsn_ie != _WPA2_IE_ID_) || (*(rsn_ie+1) != (u8)(rsn_ie_len - 2))) if ((*rsn_ie != _WPA2_IE_ID_) || (*(rsn_ie+1) != (u8)(rsn_ie_len - 2)))
return _FAIL; return _FAIL;
@ -672,8 +661,6 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie,
u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01}; u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};
uint cnt; uint cnt;
/* Search required WPA or WPA2 IE and copy to sec_ie[] */ /* Search required WPA or WPA2 IE and copy to sec_ie[] */
cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);
@ -726,8 +713,6 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie,
} }
} }
return *rsn_len + *wpa_len; return *rsn_len + *wpa_len;
} }

6
core/rtw_io.c
View file

@ -27,7 +27,6 @@ b. provides the protocol engine
c. provides the software interface between caller and the hardware interface c. provides the software interface between caller and the hardware interface
Compiler Flag Option: Compiler Flag Option:
USB: USB:
@ -51,7 +50,6 @@ jackson@realtek.com.tw
#define rtw_cpu_to_le16(val) cpu_to_le16(val) #define rtw_cpu_to_le16(val) cpu_to_le16(val)
#define rtw_cpu_to_le32(val) cpu_to_le32(val) #define rtw_cpu_to_le32(val) cpu_to_le32(val)
u8 _rtw_read8(struct adapter *adapter, u32 addr) u8 _rtw_read8(struct adapter *adapter, u32 addr)
{ {
u8 r_val; u8 r_val;
@ -174,11 +172,9 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val); int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
int ret; int ret;
_write16_async = pintfhdl->io_ops._write16_async; _write16_async = pintfhdl->io_ops._write16_async;
ret = _write16_async(pintfhdl, addr, val); ret = _write16_async(pintfhdl, addr, val);
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -189,11 +185,9 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val); int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
int ret; int ret;
_write32_async = pintfhdl->io_ops._write32_async; _write32_async = pintfhdl->io_ops._write32_async;
ret = _write32_async(pintfhdl, addr, val); ret = _write32_async(pintfhdl, addr, val);
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }

45
core/rtw_ioctl_set.c
View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_IOCTL_SET_C_ #define _RTW_IOCTL_SET_C_
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.h>
@ -42,8 +41,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
u8 i; u8 i;
u8 ret = true; u8 ret = true;
if (ssid->SsidLength > 32) { if (ssid->SsidLength > 32) {
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n"));
ret = false; ret = false;
@ -61,8 +58,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
exit: exit:
return ret; return ret;
} }
@ -74,8 +69,6 @@ u8 rtw_do_join(struct adapter *padapter)
struct __queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
spin_lock_bh(&pmlmepriv->scanned_queue.lock); spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue); phead = get_list_head(queue);
plist = get_next(phead); plist = get_next(phead);
@ -170,8 +163,6 @@ u8 rtw_do_join(struct adapter *padapter)
exit: exit:
return ret; return ret;
} }
@ -181,8 +172,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)
u32 cur_time = 0; u32 cur_time = 0;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
DBG_88E_LEVEL(_drv_info_, "set bssid:%pM\n", bssid); DBG_88E_LEVEL(_drv_info_, "set bssid:%pM\n", bssid);
if ((bssid[0] == 0x00 && bssid[1] == 0x00 && bssid[2] == 0x00 && if ((bssid[0] == 0x00 && bssid[1] == 0x00 && bssid[2] == 0x00 &&
@ -195,7 +184,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
DBG_88E("Set BSSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv)); DBG_88E("Set BSSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
goto handle_tkip_countermeasure; goto handle_tkip_countermeasure;
@ -257,8 +245,6 @@ exit:
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
("rtw_set_802_11_bssid: status=%d\n", status)); ("rtw_set_802_11_bssid: status=%d\n", status));
return status; return status;
} }
@ -270,8 +256,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *pnetwork = &pmlmepriv->cur_network; struct wlan_network *pnetwork = &pmlmepriv->cur_network;
DBG_88E_LEVEL(_drv_info_, "set ssid [%s] fw_state=0x%08x\n", DBG_88E_LEVEL(_drv_info_, "set ssid [%s] fw_state=0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv)); ssid->Ssid, get_fwstate(pmlmepriv));
@ -380,8 +364,6 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wlan_network *cur_network = &pmlmepriv->cur_network;
enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode); enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode);
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n", ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
*pold_state, networktype, get_fwstate(pmlmepriv))); *pold_state, networktype, get_fwstate(pmlmepriv)));
@ -438,18 +420,13 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
} }
return true; return true;
} }
u8 rtw_set_802_11_disassociate(struct adapter *padapter) u8 rtw_set_802_11_disassociate(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
@ -464,8 +441,6 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
return true; return true;
} }
@ -474,8 +449,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 res = true; u8 res = true;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n", get_fwstate(pmlmepriv))); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n", get_fwstate(pmlmepriv)));
if (padapter == NULL) { if (padapter == NULL) {
@ -514,8 +487,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
} }
exit: exit:
return res; return res;
} }
@ -525,8 +496,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11
int res; int res;
u8 ret; u8 ret;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n", authmode)); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n", authmode));
psecuritypriv->ndisauthtype = authmode; psecuritypriv->ndisauthtype = authmode;
@ -545,8 +514,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11
else else
ret = false; ret = false;
return ret; return ret;
} }
@ -556,8 +523,6 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)
struct security_priv *psecuritypriv = &(padapter->securitypriv); struct security_priv *psecuritypriv = &(padapter->securitypriv);
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
keyid = wep->KeyIndex & 0x3fffffff; keyid = wep->KeyIndex & 0x3fffffff;
if (keyid >= 4) { if (keyid >= 4) {
@ -619,7 +584,6 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex)
{ {
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
if (keyindex >= 0x80000000 || padapter == NULL) { if (keyindex >= 0x80000000 || padapter == NULL) {
ret = false; ret = false;
goto exit; goto exit;
@ -638,7 +602,6 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex)
} }
exit: exit:
return ret; return ret;
} }
@ -651,8 +614,6 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key)
u8 bgrouptkey = false;/* can be removed later */ u8 bgrouptkey = false;/* can be removed later */
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)) { if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)) {
/* It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */ /* It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */
/* it must fail the request and return NDIS_STATUS_INVALID_DATA. */ /* it must fail the request and return NDIS_STATUS_INVALID_DATA. */
@ -757,7 +718,6 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key)
/* Group key - KeyIndex(BIT30 == 0) */ /* Group key - KeyIndex(BIT30 == 0) */
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ Group key +++++\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ Group key +++++\n"));
/* when add wep key through add key and didn't assigned encryption type before */ /* when add wep key through add key and didn't assigned encryption type before */
if ((padapter->securitypriv.ndisauthtype <= 3) && if ((padapter->securitypriv.ndisauthtype <= 3) &&
(padapter->securitypriv.dot118021XGrpPrivacy == 0)) { (padapter->securitypriv.dot118021XGrpPrivacy == 0)) {
@ -977,7 +937,6 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key)
} }
} }
/* Set key to CAM through H2C command */ /* Set key to CAM through H2C command */
if (bgrouptkey) { /* never go to here */ if (bgrouptkey) { /* never go to here */
res = rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false); res = rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false);
@ -992,7 +951,6 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key)
} }
exit: exit:
return ret; return ret;
} }
@ -1004,8 +962,6 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove
u8 keyIndex = (u8)key->KeyIndex & 0x03; u8 keyIndex = (u8)key->KeyIndex & 0x03;
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
if ((key->KeyIndex & 0xbffffffc) > 0) { if ((key->KeyIndex & 0xbffffffc) > 0) {
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1032,7 +988,6 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove
} }
exit: exit:
return ret; return ret;
} }

3
core/rtw_led.c
View file

@ -83,7 +83,6 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed, enum LED_PIN_8
_init_workitem(&(pLed->BlinkWorkItem), BlinkWorkItemCallback, pLed); _init_workitem(&(pLed->BlinkWorkItem), BlinkWorkItemCallback, pLed);
} }
/* */ /* */
/* Description: */ /* Description: */
/* DeInitialize an LED_871x object. */ /* DeInitialize an LED_871x object. */
@ -1501,8 +1500,6 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct
RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Led %d\n", pLed->CurrLedState)); RT_TRACE(_module_rtl8712_led_c_, _drv_info_, ("Led %d\n", pLed->CurrLedState));
} }
/* Sercomm-Belkin, added by chiyoko, 20090415 */ /* Sercomm-Belkin, added by chiyoko, 20090415 */
static void static void
SwLedControlMode5( SwLedControlMode5(

99
core/rtw_mlme.c
View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
#define _RTW_MLME_C_ #define _RTW_MLME_C_
#include <linux/version.h> #include <linux/version.h>
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
@ -56,8 +55,6 @@ int _rtw_init_mlme_priv (struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int res = _SUCCESS; int res = _SUCCESS;
/* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */
pmlmepriv->nic_hdl = (u8 *)padapter; pmlmepriv->nic_hdl = (u8 *)padapter;
@ -101,8 +98,6 @@ int _rtw_init_mlme_priv (struct adapter *padapter)
exit: exit:
return res; return res;
} }
@ -145,7 +140,6 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
{ {
rtw_free_mlme_priv_ie_data(pmlmepriv); rtw_free_mlme_priv_ie_data(pmlmepriv);
if (pmlmepriv) { if (pmlmepriv) {
@ -161,7 +155,6 @@ void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork) int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
{ {
if (pnetwork == NULL) if (pnetwork == NULL)
goto exit; goto exit;
@ -173,8 +166,6 @@ int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
exit: exit:
return _SUCCESS; return _SUCCESS;
} }
@ -182,8 +173,6 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
{ {
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
spin_lock_bh(&queue->lock); spin_lock_bh(&queue->lock);
if (_rtw_queue_empty(queue)) { if (_rtw_queue_empty(queue)) {
@ -196,8 +185,6 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
spin_unlock_bh(&queue->lock); spin_unlock_bh(&queue->lock);
return pnetwork; return pnetwork;
} }
@ -207,8 +194,6 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f
struct __queue *free_queue = &pmlmepriv->free_bss_pool; struct __queue *free_queue = &pmlmepriv->free_bss_pool;
struct list_head *plist = NULL; struct list_head *plist = NULL;
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) {
@ -233,8 +218,6 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f
exit: exit:
spin_unlock_bh(&free_queue->lock); spin_unlock_bh(&free_queue->lock);
return pnetwork; return pnetwork;
} }
@ -289,7 +272,6 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
if (_rtw_memcmp(zero_addr, addr, ETH_ALEN)) { if (_rtw_memcmp(zero_addr, addr, ETH_ALEN)) {
pnetwork = NULL; pnetwork = NULL;
goto exit; goto exit;
@ -310,7 +292,6 @@ exit:
return pnetwork; return pnetwork;
} }
void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
{ {
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -318,9 +299,6 @@ void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *scanned_queue = &pmlmepriv->scanned_queue; struct __queue *scanned_queue = &pmlmepriv->scanned_queue;
spin_lock_bh(&scanned_queue->lock); spin_lock_bh(&scanned_queue->lock);
phead = get_list_head(scanned_queue); phead = get_list_head(scanned_queue);
@ -341,7 +319,6 @@ int rtw_if_up(struct adapter *padapter)
{ {
int res; int res;
if (padapter->bDriverStopped || padapter->bSurpriseRemoved || if (padapter->bDriverStopped || padapter->bSurpriseRemoved ||
(check_fwstate(&padapter->mlmepriv, _FW_LINKED) == false)) { (check_fwstate(&padapter->mlmepriv, _FW_LINKED) == false)) {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
@ -352,7 +329,6 @@ int rtw_if_up(struct adapter *padapter)
res = true; res = true;
} }
return res; return res;
} }
@ -360,7 +336,6 @@ void rtw_generate_random_ibss(u8 *pibss)
{ {
u32 curtime = rtw_get_current_time(); u32 curtime = rtw_get_current_time();
pibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */ pibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */
pibss[1] = 0x11; pibss[1] = 0x11;
pibss[2] = 0x87; pibss[2] = 0x87;
@ -376,15 +351,12 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
return ie + 8 + 2; return ie + 8 + 2;
} }
u16 rtw_get_capability(struct wlan_bssid_ex *bss) u16 rtw_get_capability(struct wlan_bssid_ex *bss)
{ {
__le16 val; __le16 val;
memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2); memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2);
return le16_to_cpu(val); return le16_to_cpu(val);
} }
@ -432,7 +404,6 @@ static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
} }
void rtw_free_network_queue(struct adapter *dev, u8 isfreeall) void rtw_free_network_queue(struct adapter *dev, u8 isfreeall)
{ {
@ -479,16 +450,12 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
u16 s_cap, d_cap; u16 s_cap, d_cap;
__le16 le_scap, le_dcap; __le16 le_scap, le_dcap;
memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->IEs), 2); memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->IEs), 2);
memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->IEs), 2); memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->IEs), 2);
s_cap = le16_to_cpu(le_scap); s_cap = le16_to_cpu(le_scap);
d_cap = le16_to_cpu(le_dcap); d_cap = le16_to_cpu(le_dcap);
return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
((_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) && ((_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) &&
((_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) && ((_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) &&
@ -504,7 +471,6 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
struct wlan_network *pwlan = NULL; struct wlan_network *pwlan = NULL;
struct wlan_network *oldest = NULL; struct wlan_network *oldest = NULL;
phead = get_list_head(scanned_queue); phead = get_list_head(scanned_queue);
plist = get_next(phead); plist = get_next(phead);
@ -535,7 +501,6 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
u8 sq_final; u8 sq_final;
long rssi_final; long rssi_final;
rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */ rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */
/* The rule below is 1/5 for sample value, 4/5 for history value */ /* The rule below is 1/5 for sample value, 4/5 for history value */
@ -569,15 +534,12 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
dst->PhyInfo.SignalQuality = sq_final; dst->PhyInfo.SignalQuality = sq_final;
dst->Rssi = rssi_final; dst->Rssi = rssi_final;
} }
static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork) static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
{ {
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) && if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) &&
(is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) { (is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) {
update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, true); update_network(&(pmlmepriv->cur_network.network), pnetwork, adapter, true);
@ -602,8 +564,6 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
struct wifidirect_info *pwdinfo= &(adapter->wdinfo); struct wifidirect_info *pwdinfo= &(adapter->wdinfo);
int target_find = 0; int target_find = 0;
spin_lock_bh(&queue->lock); spin_lock_bh(&queue->lock);
phead = get_list_head(queue); phead = get_list_head(queue);
plist = get_next(phead); plist = get_next(phead);
@ -687,7 +647,6 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
exit: exit:
spin_unlock_bh(&queue->lock); spin_unlock_bh(&queue->lock);
} }
static void rtw_add_network(struct adapter *adapter, static void rtw_add_network(struct adapter *adapter,
@ -747,7 +706,6 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *
} }
} }
if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) { if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
DBG_88E("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy); DBG_88E("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
bselected = false; bselected = false;
@ -758,7 +716,6 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *
bselected = false; bselected = false;
} }
return bselected; return bselected;
} }
@ -771,15 +728,12 @@ void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf)
return; return;
} }
void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
u32 len; u32 len;
struct wlan_bssid_ex *pnetwork; struct wlan_bssid_ex *pnetwork;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
pnetwork = (struct wlan_bssid_ex *)pbuf; pnetwork = (struct wlan_bssid_ex *)pbuf;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_survey_event_callback, ssid=%s\n", pnetwork->Ssid.Ssid)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_survey_event_callback, ssid=%s\n", pnetwork->Ssid.Ssid));
@ -819,20 +773,15 @@ exit:
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
return; return;
} }
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
u8 timer_cancelled = 0; u8 timer_cancelled = 0;
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
if (pmlmepriv->wps_probe_req_ie) { if (pmlmepriv->wps_probe_req_ie) {
@ -944,8 +893,6 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
struct __queue *scan_queue = &pmlmepriv->scanned_queue; struct __queue *scan_queue = &pmlmepriv->scanned_queue;
struct list_head *plist, *phead, *ptemp; struct list_head *plist, *phead, *ptemp;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n"));
spin_lock_bh(&scan_queue->lock); spin_lock_bh(&scan_queue->lock);
spin_lock_bh(&free_queue->lock); spin_lock_bh(&free_queue->lock);
@ -964,7 +911,6 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
spin_unlock_bh(&free_queue->lock); spin_unlock_bh(&free_queue->lock);
spin_unlock_bh(&scan_queue->lock); spin_unlock_bh(&scan_queue->lock);
} }
/* /*
@ -977,8 +923,6 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &pmlmepriv->cur_network; struct wlan_network *tgt_network = &pmlmepriv->cur_network;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n"));
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
("tgt_network->network.MacAddress=%pM ssid=%s\n", ("tgt_network->network.MacAddress=%pM ssid=%s\n",
@ -1032,8 +976,6 @@ void rtw_indicate_connect(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n"));
pmlmepriv->to_join = false; pmlmepriv->to_join = false;
@ -1061,12 +1003,10 @@ void rtw_indicate_disconnect(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n"));
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS);
if (pmlmepriv->to_roaming > 0) if (pmlmepriv->to_roaming > 0)
_clr_fwstate_(pmlmepriv, _FW_LINKED); _clr_fwstate_(pmlmepriv, _FW_LINKED);
@ -1082,7 +1022,6 @@ void rtw_indicate_disconnect(struct adapter *padapter)
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
} }
inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)
@ -1191,7 +1130,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
("\nfw_state:%x, BSSID:%pM\n", ("\nfw_state:%x, BSSID:%pM\n",
get_fwstate(pmlmepriv), pnetwork->network.MacAddress)); get_fwstate(pmlmepriv), pnetwork->network.MacAddress));
/* why not use ptarget_wlan?? */ /* why not use ptarget_wlan?? */
memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length); memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length);
/* some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */ /* some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */
@ -1200,7 +1138,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
cur_network->aid = pnetwork->join_res; cur_network->aid = pnetwork->join_res;
rtw_set_signal_stat_timer(&padapter->recvpriv); rtw_set_signal_stat_timer(&padapter->recvpriv);
padapter->recvpriv.signal_strength = ptarget_wlan->network.PhyInfo.SignalStrength; padapter->recvpriv.signal_strength = ptarget_wlan->network.PhyInfo.SignalStrength;
padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality; padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality;
@ -1249,13 +1186,10 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
unsigned int the_same_macaddr = false; unsigned int the_same_macaddr = false;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("joinbss event call back received with res=%d\n", pnetwork->join_res)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("joinbss event call back received with res=%d\n", pnetwork->join_res));
rtw_get_encrypt_decrypt_from_registrypriv(adapter); rtw_get_encrypt_decrypt_from_registrypriv(adapter);
if (pmlmepriv->assoc_ssid.SsidLength == 0) if (pmlmepriv->assoc_ssid.SsidLength == 0)
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ joinbss event call back for Any SSid\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ joinbss event call back for Any SSid\n"));
else else
@ -1315,7 +1249,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
goto ignore_joinbss_callback; goto ignore_joinbss_callback;
} }
/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ /* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) { if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork); ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork);
@ -1369,13 +1302,10 @@ void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
struct wlan_network *pnetwork = (struct wlan_network *)pbuf; struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
mlmeext_joinbss_event_callback(adapter, pnetwork->join_res); mlmeext_joinbss_event_callback(adapter, pnetwork->join_res);
rtw_os_xmit_schedule(adapter); rtw_os_xmit_schedule(adapter);
} }
static u8 search_max_mac_id(struct adapter *padapter) static u8 search_max_mac_id(struct adapter *padapter)
@ -1433,8 +1363,6 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *ptarget_wlan = NULL; struct wlan_network *ptarget_wlan = NULL;
if (rtw_access_ctrl(adapter, pstassoc->macaddr) == false) if (rtw_access_ctrl(adapter, pstassoc->macaddr) == false)
return; return;
@ -1498,8 +1426,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network); struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr); psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr);
if (psta) if (psta)
mac_id = psta->mac_id; mac_id = psta->mac_id;
@ -1605,14 +1531,11 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
int do_join_r; int do_join_r;
DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv)); DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
return; return;
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
if (rtw_to_roaming(adapter) > 0) { /* join timeout caused by roaming */ if (rtw_to_roaming(adapter) > 0) { /* join timeout caused by roaming */
@ -1733,7 +1656,6 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
int updated = false; int updated = false;
struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv); struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
/* check bssid, if needed */ /* check bssid, if needed */
if (pmlmepriv->assoc_by_bssid) { if (pmlmepriv->assoc_by_bssid) {
if (!_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)) if (!_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN))
@ -1791,8 +1713,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
struct wlan_network *candidate = NULL; struct wlan_network *candidate = NULL;
u8 supp_ant_div = false; u8 supp_ant_div = false;
spin_lock_bh(&pmlmepriv->scanned_queue.lock); spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue); phead = get_list_head(queue);
adapter = (struct adapter *)pmlmepriv->nic_hdl; adapter = (struct adapter *)pmlmepriv->nic_hdl;
@ -1817,7 +1737,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
candidate->network.Configuration.DSConfig); candidate->network.Configuration.DSConfig);
} }
/* check for situation of _FW_LINKED */ /* check for situation of _FW_LINKED */
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__); DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);
@ -1842,8 +1761,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
exit: exit:
spin_unlock_bh(&pmlmepriv->scanned_queue.lock); spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
return ret; return ret;
} }
@ -1854,8 +1771,6 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);
int res = _SUCCESS; int res = _SUCCESS;
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
res = _FAIL; /* try again */ res = _FAIL; /* try again */
@ -1894,7 +1809,6 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
int res = _SUCCESS; int res = _SUCCESS;
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
res = _FAIL; /* try again */ res = _FAIL; /* try again */
@ -2067,8 +1981,6 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
uint ndisauthmode = psecuritypriv->ndisauthtype; uint ndisauthmode = psecuritypriv->ndisauthtype;
uint ndissecuritytype = psecuritypriv->ndisencryptstatus; uint ndissecuritytype = psecuritypriv->ndisencryptstatus;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n", ("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n",
ndisauthmode, ndissecuritytype)); ndisauthmode, ndissecuritytype));
@ -2102,8 +2014,6 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength); ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
} }
return ielength; return ielength;
} }
@ -2114,8 +2024,6 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter)
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
u8 *myhwaddr = myid(peepriv); u8 *myhwaddr = myid(peepriv);
memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN); memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_11_ssid)); memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_11_ssid));
@ -2127,7 +2035,6 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter)
pdev_network->Configuration.FHConfig.HopSet = 0; pdev_network->Configuration.FHConfig.HopSet = 0;
pdev_network->Configuration.FHConfig.DwellTime = 0; pdev_network->Configuration.FHConfig.DwellTime = 0;
} }
void rtw_update_registrypriv_dev_network(struct adapter *adapter) void rtw_update_registrypriv_dev_network(struct adapter *adapter)
@ -2138,8 +2045,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; struct wlan_network *cur_network = &adapter->mlmepriv.cur_network;
pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0); /* adhoc no 802.1x */ pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0); /* adhoc no 802.1x */
pdev_network->Rssi = 0; pdev_network->Rssi = 0;
@ -2195,7 +2100,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter) void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter)
{ {
} }
/* the function is at passive_level */ /* the function is at passive_level */
@ -2239,7 +2143,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv;
u32 rx_packet_offset, max_recvbuf_sz; u32 rx_packet_offset, max_recvbuf_sz;
phtpriv->ht_option = false; phtpriv->ht_option = false;
p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12); p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12);
@ -2279,7 +2182,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
else else
ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00); ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_, rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,
sizeof(struct rtw_ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len); sizeof(struct rtw_ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len);
@ -2324,7 +2226,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
phtpriv->ampdu_enable = true; phtpriv->ampdu_enable = true;
} }
/* check Max Rx A-MPDU Size */ /* check Max Rx A-MPDU Size */
len = 0; len = 0;
p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fixed_ie), _HT_CAPABILITY_IE_, &len, ie_len-sizeof(struct ndis_802_11_fixed_ie)); p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fixed_ie), _HT_CAPABILITY_IE_, &len, ie_len-sizeof(struct ndis_802_11_fixed_ie));

78
core/rtw_mlme_ext.c
View file

@ -62,7 +62,6 @@ static struct action_handler OnAction_tbl[] = {
{RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p}, {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p},
}; };
static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
/************************************************** /**************************************************
@ -391,7 +390,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
pmlmeext->chan_scan_time = SURVEY_TO; pmlmeext->chan_scan_time = SURVEY_TO;
pmlmeext->mlmeext_init = true; pmlmeext->mlmeext_init = true;
pmlmeext->active_keep_alive_check = true; pmlmeext->active_keep_alive_check = true;
return res; return res;
@ -522,7 +520,6 @@ static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da)
} }
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
/**************************************************************************** /****************************************************************************
Following are the callback functions for each subtype of the management frames Following are the callback functions for each subtype of the management frames
@ -652,7 +649,6 @@ unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame)
} }
#endif #endif
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
report_survey_event(padapter, precv_frame); report_survey_event(padapter, precv_frame);
return _SUCCESS; return _SUCCESS;
@ -1039,7 +1035,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
ie_offset = _REASOCREQ_IE_OFFSET_; ie_offset = _REASOCREQ_IE_OFFSET_;
} }
if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset) { if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset) {
DBG_88E("handle_assoc(reassoc=%d) - too short payload (len=%lu)" DBG_88E("handle_assoc(reassoc=%d) - too short payload (len=%lu)"
"\n", reassoc, (unsigned long)pkt_len); "\n", reassoc, (unsigned long)pkt_len);
@ -1057,7 +1052,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset); left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset);
pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset); pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset);
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
/* check if this stat has been successfully authenticated/assocated */ /* check if this stat has been successfully authenticated/assocated */
@ -1083,7 +1077,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
goto OnAssocReqFail; goto OnAssocReqFail;
} }
/* now we should check all the fields... */ /* now we should check all the fields... */
/* checking SSID */ /* checking SSID */
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len, p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len,
@ -1212,7 +1205,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
pstat->flags |= WLAN_STA_MAYBE_WPS; pstat->flags |= WLAN_STA_MAYBE_WPS;
} }
/* AP support WPA/RSN, and sta is going to do WPS, but AP is not ready */ /* AP support WPA/RSN, and sta is going to do WPS, but AP is not ready */
/* that the selected registrar of AP is _FLASE */ /* that the selected registrar of AP is _FLASE */
if ((psecuritypriv->wpa_psk > 0) && (pstat->flags & (WLAN_STA_WPS|WLAN_STA_MAYBE_WPS))) { if ((psecuritypriv->wpa_psk > 0) && (pstat->flags & (WLAN_STA_WPS|WLAN_STA_MAYBE_WPS))) {
@ -1350,8 +1342,6 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
else else
pstat->flags &= ~WLAN_STA_SHORT_PREAMBLE; pstat->flags &= ~WLAN_STA_SHORT_PREAMBLE;
if (status != _STATS_SUCCESSFUL_) if (status != _STATS_SUCCESSFUL_)
goto OnAssocReqFail; goto OnAssocReqFail;
@ -1453,7 +1443,6 @@ asoc_class2_error:
OnAssocReqFail: OnAssocReqFail:
#ifdef CONFIG_88EU_AP_MODE #ifdef CONFIG_88EU_AP_MODE
pstat->aid = 0; pstat->aid = 0;
if (frame_type == WIFI_ASSOCREQ) if (frame_type == WIFI_ASSOCREQ)
@ -1462,7 +1451,6 @@ OnAssocReqFail:
issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP); issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP);
#endif #endif
#endif /* CONFIG_88EU_AP_MODE */ #endif /* CONFIG_88EU_AP_MODE */
return _FAIL; return _FAIL;
@ -1607,7 +1595,6 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
associated_clients_update(padapter, updated); associated_clients_update(padapter, updated);
} }
return _SUCCESS; return _SUCCESS;
} else } else
#endif #endif
@ -1900,8 +1887,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
pwdinfo->negotiation_dialog_token = 1; /* Initialize the dialog value */ pwdinfo->negotiation_dialog_token = 1; /* Initialize the dialog value */
pframe = rtw_set_fixed_ie(pframe, 1, &pwdinfo->negotiation_dialog_token, &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &pwdinfo->negotiation_dialog_token, &(pattrib->pktlen));
/* WPS Section */ /* WPS Section */
wpsielen = 0; wpsielen = 0;
/* WPS OUI */ /* WPS OUI */
@ -1942,7 +1927,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen); pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen);
/* P2P IE Section. */ /* P2P IE Section. */
/* P2P OUI */ /* P2P OUI */
@ -1964,7 +1948,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
/* 8. P2P Device Info */ /* 8. P2P Device Info */
/* 9. Operating Channel */ /* 9. Operating Channel */
/* P2P Capability */ /* P2P Capability */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_CAPABILITY; p2pie[p2pielen++] = P2P_ATTR_CAPABILITY;
@ -2007,7 +1990,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
p2pie[p2pielen++] = 200; /* 2 seconds needed to be the P2P GO */ p2pie[p2pielen++] = 200; /* 2 seconds needed to be the P2P GO */
p2pie[p2pielen++] = 200; /* 2 seconds needed to be the P2P Client */ p2pie[p2pielen++] = 200; /* 2 seconds needed to be the P2P Client */
/* Listen Channel */ /* Listen Channel */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_LISTEN_CH; p2pie[p2pielen++] = P2P_ATTR_LISTEN_CH;
@ -2031,7 +2013,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
/* Channel Number */ /* Channel Number */
p2pie[p2pielen++] = pwdinfo->listen_channel; /* listening channel number */ p2pie[p2pielen++] = pwdinfo->listen_channel; /* listening channel number */
/* Extended Listen Timing ATTR */ /* Extended Listen Timing ATTR */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_EX_LISTEN_TIMING; p2pie[p2pielen++] = P2P_ATTR_EX_LISTEN_TIMING;
@ -2049,7 +2030,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
*(__le16 *)(p2pie + p2pielen) = cpu_to_le16(0xFFFF); *(__le16 *)(p2pie + p2pielen) = cpu_to_le16(0xFFFF);
p2pielen += 2; p2pielen += 2;
/* Intended P2P Interface Address */ /* Intended P2P Interface Address */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_INTENTED_IF_ADDR; p2pie[p2pielen++] = P2P_ATTR_INTENTED_IF_ADDR;
@ -2062,7 +2042,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
memcpy(p2pie + p2pielen, myid(&padapter->eeprompriv), ETH_ALEN); memcpy(p2pie + p2pielen, myid(&padapter->eeprompriv), ETH_ALEN);
p2pielen += ETH_ALEN; p2pielen += ETH_ALEN;
/* Channel List */ /* Channel List */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_CH_LIST; p2pie[p2pielen++] = P2P_ATTR_CH_LIST;
@ -2156,7 +2135,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
memcpy(p2pie + p2pielen, pwdinfo->device_name , pwdinfo->device_name_len); memcpy(p2pie + p2pielen, pwdinfo->device_name , pwdinfo->device_name_len);
p2pielen += pwdinfo->device_name_len; p2pielen += pwdinfo->device_name_len;
/* Operating Channel */ /* Operating Channel */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_OPERATING_CH; p2pie[p2pielen++] = P2P_ATTR_OPERATING_CH;
@ -2307,7 +2285,6 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen); pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen);
/* P2P IE Section. */ /* P2P IE Section. */
/* P2P OUI */ /* P2P OUI */
@ -2329,7 +2306,6 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame
/* 8. Device Info */ /* 8. Device Info */
/* 9. Group ID (Only GO) */ /* 9. Group ID (Only GO) */
/* ToDo: */ /* ToDo: */
/* P2P Status */ /* P2P Status */
@ -2388,7 +2364,6 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame
p2pie[p2pielen++] = ((pwdinfo->intent << 1) | BIT(0)); p2pie[p2pielen++] = ((pwdinfo->intent << 1) | BIT(0));
} }
/* Configuration Timeout */ /* Configuration Timeout */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_CONF_TIMEOUT; p2pie[p2pielen++] = P2P_ATTR_CONF_TIMEOUT;
@ -2608,8 +2583,6 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &(pwdinfo->negotiation_dialog_token), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(pwdinfo->negotiation_dialog_token), &(pattrib->pktlen));
/* P2P IE Section. */ /* P2P IE Section. */
/* P2P OUI */ /* P2P OUI */
@ -2673,7 +2646,6 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
/* Described in the "Operating Channel Attribute" section. */ /* Described in the "Operating Channel Attribute" section. */
p2pie[p2pielen++] = 0x04; p2pie[p2pielen++] = 0x04;
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT)) { if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT)) {
/* Operating Class */ /* Operating Class */
p2pie[p2pielen++] = 0x51; p2pie[p2pielen++] = 0x51;
@ -2686,7 +2658,6 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
p2pie[p2pielen++] = pwdinfo->operating_channel; /* Use the listen channel as the operating channel */ p2pie[p2pielen++] = pwdinfo->operating_channel; /* Use the listen channel as the operating channel */
} }
/* Channel List */ /* Channel List */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_CH_LIST; p2pie[p2pielen++] = P2P_ATTR_CH_LIST;
@ -2817,7 +2788,6 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
/* Value: */ /* Value: */
p2pie[p2pielen++] = P2P_INVITATION_FLAGS_PERSISTENT; p2pie[p2pielen++] = P2P_INVITATION_FLAGS_PERSISTENT;
/* Operating Channel */ /* Operating Channel */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_OPERATING_CH; p2pie[p2pielen++] = P2P_ATTR_OPERATING_CH;
@ -2860,7 +2830,6 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_CH_LIST; p2pie[p2pielen++] = P2P_ATTR_CH_LIST;
/* Length: */ /* Length: */
/* Country String(3) */ /* Country String(3) */
/* + (Operating Class (1) + Number of Channels(1)) * Operation Classes (?) */ /* + (Operating Class (1) + Number of Channels(1)) * Operation Classes (?) */
@ -2899,7 +2868,6 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
} }
} }
/* P2P Group ID */ /* P2P Group ID */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_GROUP_ID; p2pie[p2pielen++] = P2P_ATTR_GROUP_ID;
@ -2917,7 +2885,6 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
memcpy(p2pie + p2pielen, pwdinfo->invitereq_info.go_ssid, pwdinfo->invitereq_info.ssidlen); memcpy(p2pie + p2pielen, pwdinfo->invitereq_info.go_ssid, pwdinfo->invitereq_info.ssidlen);
p2pielen += pwdinfo->invitereq_info.ssidlen; p2pielen += pwdinfo->invitereq_info.ssidlen;
/* Device Info */ /* Device Info */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_DEVICE_INFO; p2pie[p2pielen++] = P2P_ATTR_DEVICE_INFO;
@ -3103,7 +3070,6 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo
/* Channel Number */ /* Channel Number */
p2pie[p2pielen++] = pwdinfo->operating_channel; /* operating channel number */ p2pie[p2pielen++] = pwdinfo->operating_channel; /* operating channel number */
/* P2P Group BSSID */ /* P2P Group BSSID */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_GROUP_BSSID; p2pie[p2pielen++] = P2P_ATTR_GROUP_BSSID;
@ -3350,7 +3316,6 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)
pframe += 2; pframe += 2;
pattrib->pktlen += 2; pattrib->pktlen += 2;
/* SSID */ /* SSID */
pframe = rtw_set_ie(pframe, _SSID_IE_, 7, pwdinfo->p2p_wildcard_ssid, &pattrib->pktlen); pframe = rtw_set_ie(pframe, _SSID_IE_, 7, pwdinfo->p2p_wildcard_ssid, &pattrib->pktlen);
@ -3520,10 +3485,8 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)
*(__be16 *)(wpsie + wpsielen) = cpu_to_be16(pwdinfo->supported_wps_cm); *(__be16 *)(wpsie + wpsielen) = cpu_to_be16(pwdinfo->supported_wps_cm);
wpsielen += 2; wpsielen += 2;
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen); pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wpsielen, (unsigned char *)wpsie, &pattrib->pktlen);
p2pielen = build_probe_resp_p2p_ie(pwdinfo, pframe); p2pielen = build_probe_resp_p2p_ie(pwdinfo, pframe);
pframe += p2pielen; pframe += p2pielen;
pattrib->pktlen += p2pielen; pattrib->pktlen += p2pielen;
@ -3560,7 +3523,6 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
_rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
@ -3602,7 +3564,6 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
/* Use the OFDM rate in the P2P probe request frame. (6(B), 9(B), 12(B), 24(B), 36, 48, 54) */ /* Use the OFDM rate in the P2P probe request frame. (6(B), 9(B), 12(B), 24(B), 36, 48, 54) */
pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, pwdinfo->support_rate, &pattrib->pktlen); pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, pwdinfo->support_rate, &pattrib->pktlen);
/* WPS IE */ /* WPS IE */
/* Noted by Albert 20110221 */ /* Noted by Albert 20110221 */
/* According to the WPS specification, all the WPS attribute is presented by Big Endian. */ /* According to the WPS specification, all the WPS attribute is presented by Big Endian. */
@ -3758,7 +3719,6 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
/* Channel Number */ /* Channel Number */
p2pie[p2pielen++] = pwdinfo->listen_channel; /* listen channel */ p2pie[p2pielen++] = pwdinfo->listen_channel; /* listen channel */
/* Extended Listen Timing */ /* Extended Listen Timing */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_EX_LISTEN_TIMING; p2pie[p2pielen++] = P2P_ATTR_EX_LISTEN_TIMING;
@ -4270,7 +4230,6 @@ unsigned int OnAction_p2p(struct adapter *padapter, union recv_frame *precv_fram
uint len = precv_frame->u.hdr.len; uint len = precv_frame->u.hdr.len;
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
/* check RA matches or not */ /* check RA matches or not */
@ -4523,7 +4482,6 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
fctrl = &(pwlanhdr->frame_ctl); fctrl = &(pwlanhdr->frame_ctl);
*(fctrl) = 0; *(fctrl) = 0;
@ -4850,7 +4808,6 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen); pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen);
} }
/* EXTERNDED SUPPORTED RATE */ /* EXTERNDED SUPPORTED RATE */
if (rate_len > 8) if (rate_len > 8)
pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pattrib->pktlen); pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len - 8), (cur_network->SupportedRates + 8), &pattrib->pktlen);
@ -4900,7 +4857,6 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
_rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
@ -5052,7 +5008,6 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
pframe += sizeof(struct rtw_ieee80211_hdr_3addr); pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
if (psta) {/* for AP mode */ if (psta) {/* for AP mode */
#ifdef CONFIG_88EU_AP_MODE #ifdef CONFIG_88EU_AP_MODE
@ -5060,7 +5015,6 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN);
/* setting auth algo number */ /* setting auth algo number */
val16 = (u16)psta->authalg; val16 = (u16)psta->authalg;
@ -5119,7 +5073,6 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
le_tmp16 = cpu_to_le16(val16); le_tmp16 = cpu_to_le16(val16);
pframe = rtw_set_fixed_ie(pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_tmp16, &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_tmp16, &(pattrib->pktlen));
/* setting status code... */ /* setting status code... */
le_tmp16 = cpu_to_le16(status); le_tmp16 = cpu_to_le16(status);
pframe = rtw_set_fixed_ie(pframe, _STATUS_CODE_, (unsigned char *)&le_tmp16, &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, _STATUS_CODE_, (unsigned char *)&le_tmp16, &(pattrib->pktlen));
@ -5149,7 +5102,6 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
return; return;
} }
void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type) void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type)
{ {
#ifdef CONFIG_88EU_AP_MODE #ifdef CONFIG_88EU_AP_MODE
@ -5180,7 +5132,6 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
_rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
@ -5193,7 +5144,6 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
memcpy((void *)GetAddr2Ptr(pwlanhdr), myid(&(padapter->eeprompriv)), ETH_ALEN); memcpy((void *)GetAddr2Ptr(pwlanhdr), myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy((void *)GetAddr3Ptr(pwlanhdr), get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); memcpy((void *)GetAddr3Ptr(pwlanhdr), get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++; pmlmeext->mgnt_seq++;
if ((pkt_type == WIFI_ASSOCRSP) || (pkt_type == WIFI_REASSOCRSP)) if ((pkt_type == WIFI_ASSOCRSP) || (pkt_type == WIFI_REASSOCRSP))
@ -5398,7 +5348,6 @@ void issue_assocreq(struct adapter *padapter)
goto exit; /* don't connect to AP if no joint supported rate */ goto exit; /* don't connect to AP if no joint supported rate */
} }
if (bssrate_len > 8) { if (bssrate_len > 8) {
pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen)); pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));
pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen)); pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
@ -5691,7 +5640,6 @@ exit:
return ret; return ret;
} }
/* when wait_ms > 0 , this function shoule be called at process context */ /* when wait_ms > 0 , this function shoule be called at process context */
/* da == NULL for station mode */ /* da == NULL for station mode */
int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms) int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms)
@ -5916,7 +5864,6 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s
pattrib->last_txcmdsz = pattrib->pktlen; pattrib->last_txcmdsz = pattrib->pktlen;
if (wait_ack) { if (wait_ack) {
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
} else { } else {
@ -5982,7 +5929,6 @@ void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
DBG_88E(FUNC_NDEV_FMT" ra =%pM, ch:%u, offset:%u\n", DBG_88E(FUNC_NDEV_FMT" ra =%pM, ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ra, new_ch, ch_offset); FUNC_NDEV_ARG(padapter->pnetdev), ra, new_ch, ch_offset);
@ -6182,10 +6128,8 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
if (pmlmeinfo->bwmode_updated) if (pmlmeinfo->bwmode_updated)
return; return;
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
category = RTW_WLAN_CATEGORY_PUBLIC; category = RTW_WLAN_CATEGORY_PUBLIC;
action = ACT_PUBLIC_BSSCOEXIST; action = ACT_PUBLIC_BSSCOEXIST;
@ -6219,7 +6163,6 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(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, 1, &(action), &(pattrib->pktlen));
/* */ /* */
if (pmlmepriv->num_FortyMHzIntolerant > 0) { if (pmlmepriv->num_FortyMHzIntolerant > 0) {
u8 iedata = 0; u8 iedata = 0;
@ -6229,7 +6172,6 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen)); pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));
} }
/* */ /* */
_rtw_memset(ICS, 0, sizeof(ICS)); _rtw_memset(ICS, 0, sizeof(ICS));
if (pmlmepriv->num_sta_no_ht > 0) { if (pmlmepriv->num_sta_no_ht > 0) {
@ -6290,7 +6232,6 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
} }
} }
pattrib->last_txcmdsz = pattrib->pktlen; pattrib->last_txcmdsz = pattrib->pktlen;
dump_mgntframe(padapter, pmgntframe); dump_mgntframe(padapter, pmgntframe);
@ -6826,7 +6767,6 @@ void start_clnt_auth(struct adapter *padapter)
pmlmeinfo->link_count = 0; pmlmeinfo->link_count = 0;
pmlmeext->retry = 0; pmlmeext->retry = 0;
/* Because of AP's not receiving deauth before */ /* Because of AP's not receiving deauth before */
/* AP may: 1)not response auth or 2)deauth us after link is complete */ /* AP may: 1)not response auth or 2)deauth us after link is complete */
/* issue deauth before issuing auth to deal with the situation */ /* issue deauth before issuing auth to deal with the situation */
@ -6840,7 +6780,6 @@ void start_clnt_auth(struct adapter *padapter)
set_link_timer(pmlmeext, REAUTH_TO); set_link_timer(pmlmeext, REAUTH_TO);
} }
void start_clnt_assoc(struct adapter *padapter) void start_clnt_assoc(struct adapter *padapter)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -7057,7 +6996,6 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame
pmlmeext = &padapter->mlmeextpriv; pmlmeext = &padapter->mlmeextpriv;
pcmdpriv = &padapter->cmdpriv; pcmdpriv = &padapter->cmdpriv;
pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd_obj == NULL) if (pcmd_obj == NULL)
return; return;
@ -7188,10 +7126,8 @@ void report_join_res(struct adapter *padapter, int res)
DBG_88E("report_join_res(%d)\n", res); DBG_88E("report_join_res(%d)\n", res);
rtw_joinbss_event_prehandle(padapter, (u8 *)&pjoinbss_evt->network); rtw_joinbss_event_prehandle(padapter, (u8 *)&pjoinbss_evt->network);
rtw_enqueue_cmd(pcmdpriv, pcmd_obj); rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
return; return;
@ -7238,7 +7174,6 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
memcpy((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr, ETH_ALEN); memcpy((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr, ETH_ALEN);
memcpy((unsigned char *)(pdel_sta_evt->rsvd), (unsigned char *)(&reason), 2); memcpy((unsigned char *)(pdel_sta_evt->rsvd), (unsigned char *)(&reason), 2);
psta = rtw_get_stainfo(&padapter->stapriv, MacAddr); psta = rtw_get_stainfo(&padapter->stapriv, MacAddr);
if (psta) if (psta)
mac_id = (int)psta->mac_id; mac_id = (int)psta->mac_id;
@ -7300,7 +7235,6 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
return; return;
} }
/**************************************************************************** /****************************************************************************
Following are the event callback functions Following are the event callback functions
@ -7345,7 +7279,6 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta)
if (pmlmepriv->qospriv.qos_option) if (pmlmepriv->qospriv.qos_option)
psta->qos_option = true; psta->qos_option = true;
psta->state = _FW_LINKED; psta->state = _FW_LINKED;
} }
@ -7380,7 +7313,6 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
} }
} }
/* turn on dynamic functions */ /* turn on dynamic functions */
Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
@ -7486,7 +7418,6 @@ void mlmeext_sta_del_event_callback(struct adapter *padapter)
/* SelectChannel(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset); */ /* SelectChannel(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset); */
set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
flush_all_cam_entry(padapter); flush_all_cam_entry(padapter);
pmlmeinfo->state = WIFI_FW_NULL_STATE; pmlmeinfo->state = WIFI_FW_NULL_STATE;
@ -7705,7 +7636,6 @@ void survey_timer_hdl(struct adapter *padapter)
rtw_enqueue_cmd(pcmdpriv, ph2c); rtw_enqueue_cmd(pcmdpriv, ph2c);
} }
exit_survey_timer_hdl: exit_survey_timer_hdl:
return; return;
} }
@ -7800,7 +7730,6 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf; struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;
/* u32 initialgain; */ /* u32 initialgain; */
if (pparm->network.InfrastructureMode == Ndis802_11APMode) { if (pparm->network.InfrastructureMode == Ndis802_11APMode) {
#ifdef CONFIG_88EU_AP_MODE #ifdef CONFIG_88EU_AP_MODE
@ -7879,7 +7808,6 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
/* set MSR to nolink -> infra. mode */ /* set MSR to nolink -> infra. mode */
Set_MSR(padapter, _HW_STATE_STATION_); Set_MSR(padapter, _HW_STATE_STATION_);
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, NULL);
} }
@ -7990,7 +7918,6 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8)); rtw_hal_set_hwreg(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8));
} }
/* set MSR to no link state -> infra. mode */ /* set MSR to no link state -> infra. mode */
Set_MSR(padapter, _HW_STATE_STATION_); Set_MSR(padapter, _HW_STATE_STATION_);
@ -8272,8 +8199,6 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
u8 res = _SUCCESS; u8 res = _SUCCESS;
int len_diff = 0; int len_diff = 0;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -8298,11 +8223,8 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
return res; return res;
} }

4
core/rtw_mp.c
View file

@ -544,7 +544,6 @@ void SetContinuousTx(struct adapter *pAdapter, u8 bStart)
Hal_SetContinuousTx(pAdapter, bStart); Hal_SetContinuousTx(pAdapter, bStart);
} }
void PhySetTxPowerLevel(struct adapter *pAdapter) void PhySetTxPowerLevel(struct adapter *pAdapter)
{ {
struct mp_priv *pmp_priv = &pAdapter->mppriv; struct mp_priv *pmp_priv = &pAdapter->mppriv;
@ -658,7 +657,6 @@ void SetPacketTx(struct adapter *padapter)
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
struct mp_priv *pmp_priv; struct mp_priv *pmp_priv;
pmp_priv = &padapter->mppriv; pmp_priv = &padapter->mppriv;
if (pmp_priv->tx.stop) if (pmp_priv->tx.stop)
return; return;
@ -854,7 +852,6 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point)
{ {
int psd_val; int psd_val;
psd_val = rtw_read32(pAdapter, 0x808); psd_val = rtw_read32(pAdapter, 0x808);
psd_val &= 0xFFBFFC00; psd_val &= 0xFFBFFC00;
psd_val |= point; psd_val |= point;
@ -884,7 +881,6 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data)
u32 i, psd_pts = 0, psd_start = 0, psd_stop = 0; u32 i, psd_pts = 0, psd_start = 0, psd_stop = 0;
u32 psd_data = 0; u32 psd_data = 0;
if (!netif_running(pAdapter->pnetdev)) { if (!netif_running(pAdapter->pnetdev)) {
RT_TRACE(_module_mp_, _drv_warning_, ("mp_query_psd: Fail! interface not opened!\n")); RT_TRACE(_module_mp_, _drv_warning_, ("mp_query_psd: Fail! interface not opened!\n"));
return 0; return 0;

156
core/rtw_mp_ioctl.c
View file

@ -26,15 +26,12 @@
/* include <rtw_mp.h> */ /* include <rtw_mp.h> */
#include <rtw_mp_ioctl.h> #include <rtw_mp_ioctl.h>
/* rtl8188eu_oid_rtl_seg_81_85 section start **************** */ /* rtl8188eu_oid_rtl_seg_81_85 section start **************** */
int rtl8188eu_oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv) int rtl8188eu_oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
{ {
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->information_buf_len < sizeof(u8)) if (poid_par_priv->information_buf_len < sizeof(u8))
return NDIS_STATUS_INVALID_LENGTH; return NDIS_STATUS_INVALID_LENGTH;
@ -48,8 +45,6 @@ int rtl8188eu_oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
} }
return status; return status;
} }
/* rtl8188eu_oid_rtl_seg_81_87_80 section start **************** */ /* rtl8188eu_oid_rtl_seg_81_87_80 section start **************** */
@ -61,8 +56,6 @@ int rtl8188eu_oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_bb_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_bb_reg_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -87,8 +80,6 @@ int rtl8188eu_oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
write_bbreg(Adapter, offset, 0xFFFFFFFF, value); write_bbreg(Adapter, offset, 0xFFFFFFFF, value);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -100,8 +91,6 @@ int rtl8188eu_oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_bb_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_bb_reg_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
@ -127,7 +116,6 @@ int rtl8188eu_oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
("-rtl8188eu_oid_rt_pro_read_bb_reg_hdl: offset=0x%03X value:0x%08X\n", ("-rtl8188eu_oid_rt_pro_read_bb_reg_hdl: offset=0x%03X value:0x%08X\n",
offset, value)); offset, value));
return status; return status;
} }
/* */ /* */
@ -140,8 +128,6 @@ int rtl8188eu_oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_rf_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_rf_reg_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -171,8 +157,6 @@ int rtl8188eu_oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
write_rfreg(Adapter, path, offset, value); write_rfreg(Adapter, path, offset, value);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -185,8 +169,6 @@ int rtl8188eu_oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_rf_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_rf_reg_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
@ -217,8 +199,6 @@ int rtl8188eu_oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
("-rtl8188eu_oid_rt_pro_read_rf_reg_hdl: path=%d offset=0x%02X value=0x%05X\n", ("-rtl8188eu_oid_rt_pro_read_rf_reg_hdl: path=%d offset=0x%02X value=0x%05X\n",
path, offset, value)); path, offset, value));
return status; return status;
} }
/* rtl8188eu_oid_rtl_seg_81_87_00 section end**************** */ /* rtl8188eu_oid_rtl_seg_81_87_00 section end**************** */
@ -232,8 +212,6 @@ int rtl8188eu_oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, RT_TRACE(_module_mp_, _drv_notice_,
("+rtl8188eu_oid_rt_pro_set_data_rate_hdl\n")); ("+rtl8188eu_oid_rt_pro_set_data_rate_hdl\n"));
@ -255,8 +233,6 @@ int rtl8188eu_oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
SetDataRate(Adapter); SetDataRate(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -266,8 +242,6 @@ int rtl8188eu_oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_start_test_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_start_test_hdl\n"));
if (Adapter->registrypriv.mp_mode == 0) if (Adapter->registrypriv.mp_mode == 0)
@ -293,8 +267,6 @@ exit:
RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_pro_start_test_hdl: mp_mode=%d\n", Adapter->mppriv.mode)); RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_pro_start_test_hdl: mp_mode=%d\n", Adapter->mppriv.mode));
return status; return status;
} }
/* */ /* */
@ -303,8 +275,6 @@ int rtl8188eu_oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_STOP_TEST\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_STOP_TEST\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -316,8 +286,6 @@ int rtl8188eu_oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
RT_TRACE(_module_mp_, _drv_notice_, ("-Set OID_RT_PRO_STOP_TEST\n")); RT_TRACE(_module_mp_, _drv_notice_, ("-Set OID_RT_PRO_STOP_TEST\n"));
return status; return status;
} }
/* */ /* */
@ -327,8 +295,6 @@ int rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_p
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl\n"));
if (poid_par_priv->information_buf_len != sizeof(u32)) if (poid_par_priv->information_buf_len != sizeof(u32))
@ -352,8 +318,6 @@ int rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_p
SetChannel(Adapter); SetChannel(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -364,8 +328,6 @@ int rtl8188eu_oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("+rtl8188eu_oid_rt_set_bandwidth_hdl\n")); ("+rtl8188eu_oid_rt_set_bandwidth_hdl\n"));
@ -391,8 +353,6 @@ int rtl8188eu_oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
("-rtl8188eu_oid_rt_set_bandwidth_hdl: bandwidth=%d channel_offset=%d\n", ("-rtl8188eu_oid_rt_set_bandwidth_hdl: bandwidth=%d channel_offset=%d\n",
bandwidth, channel_offset)); bandwidth, channel_offset));
return status; return status;
} }
/* */ /* */
@ -402,8 +362,6 @@ int rtl8188eu_oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_antenna_bb_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_antenna_bb_hdl\n"));
if (poid_par_priv->information_buf_len != sizeof(u32)) if (poid_par_priv->information_buf_len != sizeof(u32))
@ -426,8 +384,6 @@ int rtl8188eu_oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
*(u32 *)poid_par_priv->information_buf = antenna; *(u32 *)poid_par_priv->information_buf = antenna;
} }
return status; return status;
} }
@ -437,8 +393,6 @@ int rtl8188eu_oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_set_tx_power_control_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_set_tx_power_control_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -461,8 +415,6 @@ int rtl8188eu_oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_
SetTxPower(Adapter); SetTxPower(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
@ -474,8 +426,6 @@ int rtl8188eu_oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -488,8 +438,6 @@ int rtl8188eu_oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
return status; return status;
} }
/* */ /* */
@ -498,8 +446,6 @@ int rtl8188eu_oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -513,8 +459,6 @@ int rtl8188eu_oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
return status; return status;
} }
/* */ /* */
@ -523,8 +467,6 @@ int rtl8188eu_oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *po
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -538,8 +480,6 @@ int rtl8188eu_oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *po
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
return status; return status;
} }
/* */ /* */
@ -549,8 +489,6 @@ int rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -559,8 +497,6 @@ int rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_
RT_TRACE(_module_mp_, _drv_alert_, ("===> rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl.\n")); RT_TRACE(_module_mp_, _drv_alert_, ("===> rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl.\n"));
Adapter->mppriv.tx_pktcount = 0; Adapter->mppriv.tx_pktcount = 0;
return status; return status;
} }
/* */ /* */
@ -569,8 +505,6 @@ int rtl8188eu_oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -583,8 +517,6 @@ int rtl8188eu_oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
return status; return status;
} }
/* */ /* */
@ -593,8 +525,6 @@ int rtl8188eu_oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -604,8 +534,6 @@ int rtl8188eu_oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par
ResetPhyRxPktCount(Adapter); ResetPhyRxPktCount(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -614,8 +542,6 @@ int rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_pa
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
@ -632,8 +558,6 @@ int rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_pa
RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl: recv_ok=%d\n", *(u32 *)poid_par_priv->information_buf)); RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl: recv_ok=%d\n", *(u32 *)poid_par_priv->information_buf));
return status; return status;
} }
/* */ /* */
@ -642,14 +566,11 @@ int rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len != sizeof(u32)) if (poid_par_priv->information_buf_len != sizeof(u32))
return NDIS_STATUS_INVALID_LENGTH; return NDIS_STATUS_INVALID_LENGTH;
@ -663,8 +584,6 @@ int rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid
("-rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl: recv_err =%d\n", ("-rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl: recv_err =%d\n",
*(u32 *)poid_par_priv->information_buf)); *(u32 *)poid_par_priv->information_buf));
return status; return status;
} }
/* rtl8188eu_oid_rtl_seg_81_80_20 section end **************** */ /* rtl8188eu_oid_rtl_seg_81_80_20 section end **************** */
@ -674,8 +593,6 @@ int rtl8188eu_oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_pri
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_continuous_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_continuous_tx_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -698,8 +615,6 @@ int rtl8188eu_oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_pri
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
@ -709,8 +624,6 @@ int rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -733,8 +646,6 @@ int rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
@ -744,8 +655,6 @@ int rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poi
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -768,8 +677,6 @@ int rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poi
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
@ -779,8 +686,6 @@ int rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_pr
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -792,8 +697,6 @@ int rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_pr
SetSingleToneTx(Adapter, (u8)bStartTest); SetSingleToneTx(Adapter, (u8)bStartTest);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
@ -807,7 +710,6 @@ int rtl8188eu_oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -815,8 +717,6 @@ int rtl8188eu_oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, NULL); rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, NULL);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* rtl8188eu_oid_rtl_seg_81_80_00 section end **************** */ /* rtl8188eu_oid_rtl_seg_81_80_00 section end **************** */
@ -833,8 +733,6 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("+rtl8188eu_oid_rt_pro_read_register_hdl\n")); ("+rtl8188eu_oid_rt_pro_read_register_hdl\n"));
@ -870,8 +768,6 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
*poid_par_priv->bytes_rw = width; *poid_par_priv->bytes_rw = width;
return status; return status;
} }
/* */ /* */
@ -882,8 +778,6 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("+rtl8188eu_oid_rt_pro_write_register_hdl\n")); ("+rtl8188eu_oid_rt_pro_write_register_hdl\n"));
@ -929,8 +823,6 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
("-rtl8188eu_oid_rt_pro_write_register_hdl: offset=0x%08X width=%d value=0x%X\n", ("-rtl8188eu_oid_rt_pro_write_register_hdl: offset=0x%08X width=%d value=0x%X\n",
offset, width, value)); offset, width, value));
return status; return status;
} }
/* */ /* */
@ -1002,8 +894,6 @@ int rtl8188eu_oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
RT_TRACE(_module_mp_, _drv_notice_, ("+OID_RT_PRO_SET_DATA_RATE_EX\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+OID_RT_PRO_SET_DATA_RATE_EX\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -1016,8 +906,6 @@ int rtl8188eu_oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -1027,8 +915,6 @@ int rtl8188eu_oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
u8 thermal = 0; u8 thermal = 0;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_get_thermal_meter_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_get_thermal_meter_hdl\n"));
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
@ -1044,8 +930,6 @@ int rtl8188eu_oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
*(u32 *)poid_par_priv->information_buf = (u32)thermal; *(u32 *)poid_par_priv->information_buf = (u32)thermal;
*poid_par_priv->bytes_rw = sizeof(u32); *poid_par_priv->bytes_rw = sizeof(u32);
return status; return status;
} }
/* */ /* */
@ -1059,9 +943,6 @@ int rtl8188eu_oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_pr
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->information_buf_len < sizeof(u8)) if (poid_par_priv->information_buf_len < sizeof(u8))
return NDIS_STATUS_INVALID_LENGTH; return NDIS_STATUS_INVALID_LENGTH;
@ -1079,8 +960,6 @@ int rtl8188eu_oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_pr
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -1143,8 +1022,6 @@ int rtl8188eu_oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1176,8 +1053,6 @@ int rtl8188eu_oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -1189,9 +1064,6 @@ int rtl8188eu_oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1216,8 +1088,6 @@ int rtl8188eu_oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */
@ -1227,8 +1097,6 @@ int rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
*poid_par_priv->bytes_rw = 0; *poid_par_priv->bytes_rw = 0;
if (poid_par_priv->information_buf_len < sizeof(struct pgpkt *)) if (poid_par_priv->information_buf_len < sizeof(struct pgpkt *))
@ -1267,8 +1135,6 @@ int rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("-rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl: status=0x%08X\n", status)); ("-rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl: status=0x%08X\n", status));
return status; return status;
} }
/* */ /* */
@ -1279,8 +1145,6 @@ int rtl8188eu_oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_pr
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1297,7 +1161,6 @@ int rtl8188eu_oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_pr
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
} }
return status; return status;
} }
/* */ /* */
@ -1306,8 +1169,6 @@ int rtl8188eu_oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1321,8 +1182,6 @@ int rtl8188eu_oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv)
("-rtl8188eu_oid_rt_get_efuse_max_size_hdl: size=%d status=0x%08X\n", ("-rtl8188eu_oid_rt_get_efuse_max_size_hdl: size=%d status=0x%08X\n",
*(int *)poid_par_priv->information_buf, status)); *(int *)poid_par_priv->information_buf, status));
return status; return status;
} }
/* */ /* */
@ -1330,8 +1189,6 @@ int rtl8188eu_oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv)
{ {
int status; int status;
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_efuse_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_efuse_hdl\n"));
if (poid_par_priv->type_of_oid == QUERY_OID) if (poid_par_priv->type_of_oid == QUERY_OID)
@ -1341,8 +1198,6 @@ int rtl8188eu_oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv)
RT_TRACE(_module_mp_, _drv_info_, ("-rtl8188eu_oid_rt_pro_efuse_hdl: status=0x%08X\n", status)); RT_TRACE(_module_mp_, _drv_info_, ("-rtl8188eu_oid_rt_pro_efuse_hdl: status=0x%08X\n", status));
return status; return status;
} }
/* */ /* */
@ -1353,8 +1208,6 @@ int rtl8188eu_oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
u16 maplen = 0; u16 maplen = 0;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_efuse_map_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_efuse_map_hdl\n"));
EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&maplen, false); EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&maplen, false);
@ -1398,8 +1251,6 @@ int rtl8188eu_oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("-rtl8188eu_oid_rt_pro_efuse_map_hdl: status=0x%08X\n", status)); ("-rtl8188eu_oid_rt_pro_efuse_map_hdl: status=0x%08X\n", status));
return status; return status;
} }
@ -1414,8 +1265,6 @@ int rtl8188eu_oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
u8 rx_pkt_type; u8 rx_pkt_type;
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_set_rx_packet_type_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_set_rx_packet_type_hdl\n"));
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
@ -1428,7 +1277,6 @@ int rtl8188eu_oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
RT_TRACE(_module_mp_, _drv_info_, ("rx_pkt_type: %x\n", rx_pkt_type)); RT_TRACE(_module_mp_, _drv_info_, ("rx_pkt_type: %x\n", rx_pkt_type));
return status; return status;
} }
@ -1482,8 +1330,6 @@ int rtl8188eu_oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv)
{ {
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
return status; return status;
@ -1497,8 +1343,6 @@ int rtl8188eu_oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv)
/* CALL the power_down function */ /* CALL the power_down function */
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
return status; return status;
} }
/* */ /* */

43
core/rtw_p2p.c
View file

@ -65,7 +65,6 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
plist = get_next(plist); plist = get_next(plist);
if (psta->is_p2p_device) { if (psta->is_p2p_device) {
tmplen = 0; tmplen = 0;
@ -108,7 +107,6 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
pcur += psta->dev_name_len; pcur += psta->dev_name_len;
} }
tmplen = (u8)(pcur-pstart); tmplen = (u8)(pcur-pstart);
*pstart = (tmplen-1); *pstart = (tmplen-1);
@ -238,7 +236,6 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(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, &(dialogToken), &(pattrib->pktlen));
/* Build P2P IE */ /* Build P2P IE */
/* P2P OUI */ /* P2P OUI */
p2pielen = 0; p2pielen = 0;
@ -387,7 +384,6 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(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, &(dialogToken), &(pattrib->pktlen));
/* Add P2P IE header */ /* Add P2P IE header */
/* P2P OUI */ /* P2P OUI */
p2pielen = 0; p2pielen = 0;
@ -407,11 +403,8 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_NOA, 2, noa_attr_content); p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_NOA, 2, noa_attr_content);
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &(pattrib->pktlen)); pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &(pattrib->pktlen));
pattrib->last_txcmdsz = pattrib->pktlen; pattrib->last_txcmdsz = pattrib->pktlen;
dump_mgntframe(padapter, pmgntframe); dump_mgntframe(padapter, pmgntframe);
@ -431,7 +424,6 @@ u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
p2pie[p2pielen++] = 0x9A; p2pie[p2pielen++] = 0x9A;
p2pie[p2pielen++] = 0x09; /* WFA P2P v1.0 */ p2pie[p2pielen++] = 0x09; /* WFA P2P v1.0 */
/* According to the P2P Specification, the beacon frame should contain 3 P2P attributes */ /* According to the P2P Specification, the beacon frame should contain 3 P2P attributes */
/* 1. P2P Capability */ /* 1. P2P Capability */
/* 2. P2P Device ID */ /* 2. P2P Device ID */
@ -534,7 +526,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
RTW_PUT_LE16(p2pie + p2pielen, 0xFFFF); RTW_PUT_LE16(p2pie + p2pielen, 0xFFFF);
p2pielen += 2; p2pielen += 2;
/* Notice of Absence ATTR */ /* Notice of Absence ATTR */
/* Type: */ /* Type: */
/* Length: */ /* Length: */
@ -603,10 +594,8 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
p2pielen += go_add_group_info_attr(pwdinfo, p2pie + p2pielen); p2pielen += go_add_group_info_attr(pwdinfo, p2pie + p2pielen);
pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *)p2pie, &len); pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *)p2pie, &len);
return len; return len;
} }
@ -647,7 +636,6 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8
else else
p2pie[p2pielen++] = DMP_P2P_GRPCAP_SUPPORT; p2pie[p2pielen++] = DMP_P2P_GRPCAP_SUPPORT;
/* Device Info ATTR */ /* Device Info ATTR */
/* Type: */ /* Type: */
p2pie[p2pielen++] = P2P_ATTR_DEVICE_INFO; p2pie[p2pielen++] = P2P_ATTR_DEVICE_INFO;
@ -733,11 +721,9 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8
pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *)p2pie, &len); pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *)p2pie, &len);
return len; return len;
} }
u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status_code) u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status_code)
{ {
u8 p2pie[MAX_P2P_IE_LEN] = { 0x00 }; u8 p2pie[MAX_P2P_IE_LEN] = { 0x00 };
@ -754,11 +740,9 @@ u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status
/* 1. Status */ /* 1. Status */
/* 2. Extended Listen Timing (optional) */ /* 2. Extended Listen Timing (optional) */
/* Status ATTR */ /* Status ATTR */
p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_STATUS, 1, &status_code); p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_STATUS, 1, &status_code);
/* Extended Listen Timing ATTR */ /* Extended Listen Timing ATTR */
/* Type: */ /* Type: */
/* Length: */ /* Length: */
@ -838,7 +822,6 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
} }
} }
return ret; return ret;
} }
@ -887,7 +870,6 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
/* Check Extended Listen Timing ATTR */ /* Check Extended Listen Timing ATTR */
/* Check P2P Device Info ATTR */ /* Check P2P Device Info ATTR */
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint *)&attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint *)&attr_contentlen)) {
DBG_88E("[%s] Got P2P DEVICE INFO Attr!!\n", __func__); DBG_88E("[%s] Got P2P DEVICE INFO Attr!!\n", __func__);
@ -930,7 +912,6 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
pattr_content += (num_of_secdev_type*8); pattr_content += (num_of_secdev_type*8);
} }
psta->dev_name_len = 0; psta->dev_name_len = 0;
if (WPS_ATTR_DEVICE_NAME == be16_to_cpu(*(__be16 *)pattr_content)) { if (WPS_ATTR_DEVICE_NAME == be16_to_cpu(*(__be16 *)pattr_content)) {
dev_name_len = be16_to_cpu(*(__be16 *)(pattr_content+2)); dev_name_len = be16_to_cpu(*(__be16 *)(pattr_content+2));
@ -1008,7 +989,6 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
} }
} }
/* issue Device Discoverability Response */ /* issue Device Discoverability Response */
issue_p2p_devdisc_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken); issue_p2p_devdisc_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken);
@ -1193,7 +1173,6 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
} }
} }
attr_contentlen = 0; attr_contentlen = 0;
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_INTENTED_IF_ADDR, pwdinfo->p2p_peer_interface_addr, &attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_INTENTED_IF_ADDR, pwdinfo->p2p_peer_interface_addr, &attr_contentlen)) {
if (attr_contentlen != ETH_ALEN) if (attr_contentlen != ETH_ALEN)
@ -1498,8 +1477,6 @@ static void find_phase_handler(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ndis_802_11_ssid ssid; struct ndis_802_11_ssid ssid;
_rtw_memset((unsigned char *)&ssid, 0, sizeof(struct ndis_802_11_ssid)); _rtw_memset((unsigned char *)&ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN); memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN);
ssid.SsidLength = P2P_WILDCARD_SSID_LEN; ssid.SsidLength = P2P_WILDCARD_SSID_LEN;
@ -1509,8 +1486,6 @@ static void find_phase_handler(struct adapter *padapter)
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
} }
void p2p_concurrent_handler(struct adapter *padapter); void p2p_concurrent_handler(struct adapter *padapter);
@ -1519,7 +1494,6 @@ static void restore_p2p_state_handler(struct adapter *padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL))
rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE);
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
@ -1537,13 +1511,11 @@ static void pre_tx_invitereq_handler(struct adapter *padapter)
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
set_channel_bwmode(padapter, pwdinfo->invitereq_info.peer_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->invitereq_info.peer_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
} }
static void pre_tx_provdisc_handler(struct adapter *padapter) static void pre_tx_provdisc_handler(struct adapter *padapter)
@ -1551,13 +1523,11 @@ static void pre_tx_provdisc_handler(struct adapter *padapter)
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
} }
static void pre_tx_negoreq_handler(struct adapter *padapter) static void pre_tx_negoreq_handler(struct adapter *padapter)
@ -1565,13 +1535,11 @@ static void pre_tx_negoreq_handler(struct adapter *padapter)
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
} }
void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType) void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType)
@ -1595,7 +1563,6 @@ void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType)
break; break;
} }
} }
void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength) void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
@ -1611,8 +1578,6 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
u8 find_p2p = false, find_p2p_ps = false; u8 find_p2p = false, find_p2p_ps = false;
u8 noa_offset, noa_num, noa_index; u8 noa_offset, noa_num, noa_index;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
if (IELength <= _BEACON_IE_OFFSET_) if (IELength <= _BEACON_IE_OFFSET_)
@ -1684,7 +1649,6 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
} }
} }
void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state) void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
@ -1692,8 +1656,6 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
/* Pre action for p2p state */ /* Pre action for p2p state */
switch (p2p_ps_state) { switch (p2p_ps_state) {
case P2P_PS_DISABLE: case P2P_PS_DISABLE:
@ -1739,7 +1701,6 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
break; break;
} }
} }
u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue) u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)
@ -1750,8 +1711,6 @@ u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return res; return res;
@ -1782,8 +1741,6 @@ u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)
exit: exit:
return res; return res;
} }

26
core/rtw_pwrctrl.c
View file

@ -72,7 +72,6 @@ int ips_leave(struct adapter *padapter)
int result = _SUCCESS; int result = _SUCCESS;
int keyid; int keyid;
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
if ((pwrpriv->rf_pwrstate == rf_off) && (!pwrpriv->bips_processing)) { if ((pwrpriv->rf_pwrstate == rf_off) && (!pwrpriv->bips_processing)) {
@ -227,11 +226,8 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
u8 rpwm; u8 rpwm;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
pslv = PS_STATE(pslv); pslv = PS_STATE(pslv);
if (pwrpriv->btcoex_rfon) { if (pwrpriv->btcoex_rfon) {
if (pslv < PS_STATE_S4) if (pslv < PS_STATE_S4)
pslv = PS_STATE_S3; pslv = PS_STATE_S3;
@ -276,7 +272,6 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
pwrpriv->tog += 0x80; pwrpriv->tog += 0x80;
pwrpriv->cpwm = pslv; pwrpriv->cpwm = pslv;
} }
static u8 PS_RDY_CHECK(struct adapter *padapter) static u8 PS_RDY_CHECK(struct adapter *padapter)
@ -285,7 +280,6 @@ static u8 PS_RDY_CHECK(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
curr_time = rtw_get_current_time(); curr_time = rtw_get_current_time();
delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp; delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
@ -314,8 +308,6 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
("%s: PowerMode=%d Smart_PS=%d\n", ("%s: PowerMode=%d Smart_PS=%d\n",
__func__, ps_mode, smart_ps)); __func__, ps_mode, smart_ps));
@ -364,7 +356,6 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
} }
} }
} }
/* /*
@ -379,7 +370,6 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
u8 bAwake = false; u8 bAwake = false;
s32 err = 0; s32 err = 0;
start_time = rtw_get_current_time(); start_time = rtw_get_current_time();
while (1) { while (1) {
rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake); rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake);
@ -411,8 +401,6 @@ void LPS_Enter(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
if (PS_RDY_CHECK(padapter) == false) if (PS_RDY_CHECK(padapter) == false)
return; return;
@ -431,7 +419,6 @@ void LPS_Enter(struct adapter *padapter)
} }
} }
} }
#define LPS_LEAVE_TIMEOUT_MS 100 #define LPS_LEAVE_TIMEOUT_MS 100
@ -442,8 +429,6 @@ void LPS_Leave(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
if (pwrpriv->bLeisurePs) { if (pwrpriv->bLeisurePs) {
if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) { if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) {
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0x40); rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0x40);
@ -455,7 +440,6 @@ void LPS_Leave(struct adapter *padapter)
pwrpriv->bpower_saving = false; pwrpriv->bpower_saving = false;
} }
/* */ /* */
@ -467,23 +451,18 @@ void LeaveAllPowerSaveMode(struct adapter *Adapter)
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
u8 enqueue = 0; u8 enqueue = 0;
if (check_fwstate(pmlmepriv, _FW_LINKED)) { /* connect */ if (check_fwstate(pmlmepriv, _FW_LINKED)) { /* connect */
p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue); p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue);
rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue); rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue);
} }
} }
void rtw_init_pwrctrl_priv(struct adapter *padapter) void rtw_init_pwrctrl_priv(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
_init_pwrlock(&pwrctrlpriv->lock); _init_pwrlock(&pwrctrlpriv->lock);
pwrctrlpriv->rf_pwrstate = rf_on; pwrctrlpriv->rf_pwrstate = rf_on;
pwrctrlpriv->ips_enter_cnts = 0; pwrctrlpriv->ips_enter_cnts = 0;
@ -521,18 +500,14 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
_init_timer(&(pwrctrlpriv->pwr_state_check_timer), padapter->pnetdev, pwr_state_check_handler, (u8 *)padapter); _init_timer(&(pwrctrlpriv->pwr_state_check_timer), padapter->pnetdev, pwr_state_check_handler, (u8 *)padapter);
} }
void rtw_free_pwrctrl_priv(struct adapter *adapter) void rtw_free_pwrctrl_priv(struct adapter *adapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv;
_free_pwrlock(&pwrctrlpriv->lock); _free_pwrlock(&pwrctrlpriv->lock);
} }
u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func efunc_id, u8 *val) u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func efunc_id, u8 *val)
@ -543,7 +518,6 @@ u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func efunc_i
return bResult; return bResult;
} }
inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms) inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;

69
core/rtw_recv.c
View file

@ -46,14 +46,12 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
{ {
_rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv)); _rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv));
spin_lock_init(&psta_recvpriv->lock); spin_lock_init(&psta_recvpriv->lock);
_rtw_init_queue(&psta_recvpriv->defrag_q); _rtw_init_queue(&psta_recvpriv->defrag_q);
} }
int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
@ -64,7 +62,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
int res = _SUCCESS; int res = _SUCCESS;
spin_lock_init(&precvpriv->lock); spin_lock_init(&precvpriv->lock);
_rtw_init_queue(&precvpriv->free_recv_queue); _rtw_init_queue(&precvpriv->free_recv_queue);
@ -113,8 +110,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
rtw_set_signal_stat_timer(precvpriv); rtw_set_signal_stat_timer(precvpriv);
exit: exit:
return res; return res;
} }
@ -131,8 +126,6 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
{ {
struct adapter *padapter = precvpriv->adapter; struct adapter *padapter = precvpriv->adapter;
rtw_free_uc_swdec_pending_queue(padapter); rtw_free_uc_swdec_pending_queue(padapter);
rtw_mfree_recv_priv_lock(precvpriv); rtw_mfree_recv_priv_lock(precvpriv);
@ -145,7 +138,6 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
rtw_hal_free_recv_priv(padapter); rtw_hal_free_recv_priv(padapter);
} }
union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue) union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
@ -155,7 +147,6 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
struct adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
if (_rtw_queue_empty(pfree_recv_queue)) { if (_rtw_queue_empty(pfree_recv_queue)) {
precvframe = NULL; precvframe = NULL;
} else { } else {
@ -174,8 +165,6 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
} }
} }
return precvframe; return precvframe;
} }
@ -205,7 +194,6 @@ int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_
struct adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
if (!precvframe) if (!precvframe)
return _FAIL; return _FAIL;
padapter = precvframe->u.hdr.adapter; padapter = precvframe->u.hdr.adapter;
@ -230,8 +218,6 @@ int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_
spin_unlock_bh(&pfree_recv_queue->lock); spin_unlock_bh(&pfree_recv_queue->lock);
return _SUCCESS; return _SUCCESS;
} }
@ -240,8 +226,6 @@ int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
struct adapter *padapter = precvframe->u.hdr.adapter; struct adapter *padapter = precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
rtw_list_delete(&(precvframe->u.hdr.list)); rtw_list_delete(&(precvframe->u.hdr.list));
rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(queue)); rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(queue));
@ -250,8 +234,6 @@ int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
precvpriv->free_recvframe_cnt++; precvpriv->free_recvframe_cnt++;
} }
return _SUCCESS; return _SUCCESS;
} }
@ -279,7 +261,6 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfre
union recv_frame *precvframe; union recv_frame *precvframe;
struct list_head *plist, *phead; struct list_head *plist, *phead;
spin_lock(&pframequeue->lock); spin_lock(&pframequeue->lock);
phead = get_list_head(pframequeue); phead = get_list_head(pframequeue);
@ -295,7 +276,6 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfre
spin_unlock(&pframequeue->lock); spin_unlock(&pframequeue->lock);
} }
u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter) u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
@ -376,7 +356,6 @@ static int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvfra
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]); stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]);
if (prxattrib->encrypt == _TKIP_) { if (prxattrib->encrypt == _TKIP_) {
@ -483,8 +462,6 @@ static int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvfra
exit: exit:
return res; return res;
} }
@ -496,7 +473,6 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
union recv_frame *return_packet = precv_frame; union recv_frame *return_packet = precv_frame;
u32 res = _SUCCESS; u32 res = _SUCCESS;
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("prxstat->decrypted=%x prxattrib->encrypt=0x%03x\n", prxattrib->bdecrypted, prxattrib->encrypt)); RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("prxstat->decrypted=%x prxattrib->encrypt=0x%03x\n", prxattrib->bdecrypted, prxattrib->encrypt));
if (prxattrib->encrypt > 0) { if (prxattrib->encrypt > 0) {
@ -548,8 +524,6 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
prxattrib->bdecrypted = true; prxattrib->bdecrypted = true;
} }
return return_packet; return return_packet;
} }
@ -567,8 +541,6 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
__be16 be_tmp; __be16 be_tmp;
pstapriv = &adapter->stapriv; pstapriv = &adapter->stapriv;
auth_alg = adapter->securitypriv.dot11AuthAlgrthm; auth_alg = adapter->securitypriv.dot11AuthAlgrthm;
@ -629,8 +601,6 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre
prtnframe = precv_frame; prtnframe = precv_frame;
} }
return prtnframe; return prtnframe;
} }
@ -641,8 +611,6 @@ static int recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo
u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) | u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
(precv_frame->u.hdr.attrib.frag_num & 0xf); (precv_frame->u.hdr.attrib.frag_num & 0xf);
if (tid > 15) { if (tid > 15) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl=0x%x, tid=0x%x\n", seq_ctrl, tid)); RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl=0x%x, tid=0x%x\n", seq_ctrl, tid));
@ -659,8 +627,6 @@ static int recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo
prxcache->tid_rxseq[tid] = seq_ctrl; prxcache->tid_rxseq[tid] = seq_ctrl;
return _SUCCESS; return _SUCCESS;
} }
@ -793,8 +759,6 @@ int sta2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame, s
u8 *sta_addr = NULL; u8 *sta_addr = NULL;
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
/* filter packets that SA is myself or multicast or broadcast */ /* filter packets that SA is myself or multicast or broadcast */
@ -887,8 +851,6 @@ static int ap2sta_data_frame (
u8 *myhwaddr = myid(&adapter->eeprompriv); u8 *myhwaddr = myid(&adapter->eeprompriv);
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) && if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) &&
(check_fwstate(pmlmepriv, _FW_LINKED) == true || (check_fwstate(pmlmepriv, _FW_LINKED) == true ||
check_fwstate(pmlmepriv, _FW_UNDER_LINKING))) { check_fwstate(pmlmepriv, _FW_UNDER_LINKING))) {
@ -980,8 +942,6 @@ static int ap2sta_data_frame (
exit: exit:
return ret; return ret;
} }
@ -996,8 +956,6 @@ static int sta2ap_data_frame(struct adapter *adapter,
unsigned char *mybssid = get_bssid(pmlmepriv); unsigned char *mybssid = get_bssid(pmlmepriv);
int ret = _SUCCESS; int ret = _SUCCESS;
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
/* For AP mode, RA = BSSID, TX = STA(SRC_ADDR), A3 = DST_ADDR */ /* For AP mode, RA = BSSID, TX = STA(SRC_ADDR), A3 = DST_ADDR */
if (!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) { if (!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) {
@ -1042,8 +1000,6 @@ static int sta2ap_data_frame(struct adapter *adapter,
exit: exit:
return ret; return ret;
} }
@ -1220,8 +1176,6 @@ static int validate_recv_data_frame(struct adapter *adapter,
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
int ret = _SUCCESS; int ret = _SUCCESS;
bretry = GetRetry(ptr); bretry = GetRetry(ptr);
pda = get_da(ptr); pda = get_da(ptr);
psa = get_sa(ptr); psa = get_sa(ptr);
@ -1325,8 +1279,6 @@ static int validate_recv_data_frame(struct adapter *adapter,
exit: exit:
return ret; return ret;
} }
@ -1345,8 +1297,6 @@ static int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_
u8 ver = (unsigned char) (*ptr)&0x3; u8 ver = (unsigned char) (*ptr)&0x3;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
int ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, rtw_get_oper_ch(adapter)); int ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, rtw_get_oper_ch(adapter));
if (ch_set_idx >= 0) if (ch_set_idx >= 0)
@ -1435,8 +1385,6 @@ static int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_
exit: exit:
return retval; return retval;
} }
@ -1458,8 +1406,6 @@ static int wlanhdr_to_ethhdr (union recv_frame *precvframe)
u8 *ptr = get_recvframe_data(precvframe); /* point to frame_ctrl field */ u8 *ptr = get_recvframe_data(precvframe); /* point to frame_ctrl field */
struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib;
if (pattrib->encrypt) if (pattrib->encrypt)
recvframe_pull_tail(precvframe, pattrib->icv_len); recvframe_pull_tail(precvframe, pattrib->icv_len);
@ -1509,7 +1455,6 @@ static int wlanhdr_to_ethhdr (union recv_frame *precvframe)
memcpy(ptr+12, &be_tmp, 2); memcpy(ptr+12, &be_tmp, 2);
} }
return ret; return ret;
} }
@ -1523,8 +1468,6 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queu
union recv_frame *prframe, *pnextrframe; union recv_frame *prframe, *pnextrframe;
struct __queue *pfree_recv_queue; struct __queue *pfree_recv_queue;
curfragnum = 0; curfragnum = 0;
pfree_recv_queue = &adapter->recvpriv.free_recv_queue; pfree_recv_queue = &adapter->recvpriv.free_recv_queue;
@ -1589,8 +1532,6 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queu
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Performance defrag!!!!!\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Performance defrag!!!!!\n"));
return prframe; return prframe;
} }
@ -1607,8 +1548,6 @@ union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union recv_fram
union recv_frame *prtnframe = NULL; union recv_frame *prtnframe = NULL;
struct __queue *pfree_recv_queue, *pdefrag_q; struct __queue *pfree_recv_queue, *pdefrag_q;
pstapriv = &padapter->stapriv; pstapriv = &padapter->stapriv;
pfhdr = &precv_frame->u.hdr; pfhdr = &precv_frame->u.hdr;
@ -1692,8 +1631,6 @@ union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union recv_fram
} }
} }
return prtnframe; return prtnframe;
} }
@ -2217,8 +2154,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe)
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
s32 ret = _SUCCESS; s32 ret = _SUCCESS;
padapter = precvframe->u.hdr.adapter; padapter = precvframe->u.hdr.adapter;
precvpriv = &padapter->recvpriv; precvpriv = &padapter->recvpriv;
@ -2231,8 +2166,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe)
precvpriv->rx_pkts++; precvpriv->rx_pkts++;
return ret; return ret;
_recv_entry_drop: _recv_entry_drop:
@ -2240,8 +2173,6 @@ _recv_entry_drop:
if (padapter->registrypriv.mp_mode == 1) if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.rx_pktloss = precvpriv->rx_drop; padapter->mppriv.rx_pktloss = precvpriv->rx_drop;
return ret; return ret;
} }

1
core/rtw_rf.c
View file

@ -24,7 +24,6 @@
#include <recv_osdep.h> #include <recv_osdep.h>
#include <xmit_osdep.h> #include <xmit_osdep.h>
struct ch_freq { struct ch_freq {
u32 channel; u32 channel;
u32 frequency; u32 frequency;

19
core/rtw_security.c
View file

@ -162,8 +162,6 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL) if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return; return;
@ -203,7 +201,6 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
} }
} }
} }
void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
@ -218,8 +215,6 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
struct rx_pkt_attrib *prxattrib = &(((union recv_frame *)precvframe)->u.hdr.attrib); struct rx_pkt_attrib *prxattrib = &(((union recv_frame *)precvframe)->u.hdr.attrib);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data; pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
/* start to decrypt recvframe */ /* start to decrypt recvframe */
@ -386,8 +381,6 @@ void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_cod
} }
/* macros for extraction/creation of unsigned char/unsigned short values */ /* macros for extraction/creation of unsigned char/unsigned short values */
#define RotR1(v16) ((((v16) >> 1) & 0x7FFF) ^ (((v16) & 1) << 15)) #define RotR1(v16) ((((v16) >> 1) & 0x7FFF) ^ (((v16) & 1) << 15))
#define Lo8(v16) ((u8)((v16) & 0x00FF)) #define Lo8(v16) ((u8)((v16) & 0x00FF))
@ -610,7 +603,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
u32 res = _SUCCESS; u32 res = _SUCCESS;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL) if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return _FAIL; return _FAIL;
@ -691,8 +683,6 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
u32 res = _SUCCESS; u32 res = _SUCCESS;
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data; pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
/* 4 start to decrypt recvframe */ /* 4 start to decrypt recvframe */
@ -751,7 +741,6 @@ exit:
/* 3 ===== AES related ===== */ /* 3 ===== AES related ===== */
#define MAX_MSG_SIZE 2048 #define MAX_MSG_SIZE 2048
/*****************************/ /*****************************/
/******** SBOX Table *********/ /******** SBOX Table *********/
@ -1076,7 +1065,6 @@ static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, int a4_exists, int
mic_header2[15] = mpdu[31] & 0x00; mic_header2[15] = mpdu[31] & 0x00;
} }
} }
/************************************************/ /************************************************/
@ -1139,7 +1127,6 @@ static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
uint frtype = GetFrameType(pframe); uint frtype = GetFrameType(pframe);
uint frsubtype = GetFrameSubType(pframe); uint frsubtype = GetFrameSubType(pframe);
frsubtype = frsubtype>>4; frsubtype = frsubtype>>4;
_rtw_memset((void *)mic_iv, 0, 16); _rtw_memset((void *)mic_iv, 0, 16);
@ -1272,7 +1259,6 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
/* uint offset = 0; */ /* uint offset = 0; */
u32 res = _SUCCESS; u32 res = _SUCCESS;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL) if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return _FAIL; return _FAIL;
@ -1314,8 +1300,6 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
} }
} }
return res; return res;
} }
@ -1764,13 +1748,10 @@ void rtw_use_tkipkey_handler(void *FunctionContext)
{ {
struct adapter *padapter = (struct adapter *)FunctionContext; struct adapter *padapter = (struct adapter *)FunctionContext;
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler ^^^\n")); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler ^^^\n"));
padapter->securitypriv.busetkipkey = true; padapter->securitypriv.busetkipkey = true;
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n", padapter->securitypriv.busetkipkey)); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n", padapter->securitypriv.busetkipkey));
} }

27
core/rtw_sta_mgt.c
View file

@ -69,7 +69,6 @@ static void _rtw_init_stainfo(struct sta_info *psta)
#endif /* CONFIG_88EU_AP_MODE */ #endif /* CONFIG_88EU_AP_MODE */
} }
u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
@ -77,8 +76,6 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
struct sta_info *psta; struct sta_info *psta;
s32 i; s32 i;
pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA + 4); pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA + 4);
if (!pstapriv->pallocated_stainfo_buf) if (!pstapriv->pallocated_stainfo_buf)
@ -125,8 +122,6 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
pstapriv->max_num_sta = NUM_STA; pstapriv->max_num_sta = NUM_STA;
#endif #endif
return _SUCCESS; return _SUCCESS;
} }
@ -152,7 +147,6 @@ void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv);
void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv) void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv)
{ {
_rtw_spinlock_free(&psta_xmitpriv->lock); _rtw_spinlock_free(&psta_xmitpriv->lock);
_rtw_spinlock_free(&(psta_xmitpriv->be_q.sta_pending.lock)); _rtw_spinlock_free(&(psta_xmitpriv->be_q.sta_pending.lock));
@ -165,26 +159,22 @@ void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv)
static void _rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv) static void _rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv)
{ {
_rtw_spinlock_free(&psta_recvpriv->lock); _rtw_spinlock_free(&psta_recvpriv->lock);
_rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock)); _rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock));
} }
void rtw_mfree_stainfo(struct sta_info *psta); void rtw_mfree_stainfo(struct sta_info *psta);
void rtw_mfree_stainfo(struct sta_info *psta) void rtw_mfree_stainfo(struct sta_info *psta)
{ {
if (&psta->lock != NULL) if (&psta->lock != NULL)
_rtw_spinlock_free(&psta->lock); _rtw_spinlock_free(&psta->lock);
_rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv); _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv);
_rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv); _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv);
} }
/* this function is used to free the memory of lock || sema for all stainfos */ /* this function is used to free the memory of lock || sema for all stainfos */
@ -194,8 +184,6 @@ void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
spin_lock_bh(&pstapriv->sta_hash_lock); spin_lock_bh(&pstapriv->sta_hash_lock);
phead = get_list_head(&pstapriv->free_sta_queue); phead = get_list_head(&pstapriv->free_sta_queue);
@ -210,7 +198,6 @@ void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)
spin_unlock_bh(&pstapriv->sta_hash_lock); spin_unlock_bh(&pstapriv->sta_hash_lock);
} }
static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv) static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)
@ -241,7 +228,6 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
int index; int index;
if (pstapriv) { if (pstapriv) {
/* delete all reordering_ctrl_timer */ /* delete all reordering_ctrl_timer */
spin_lock_bh(&pstapriv->sta_hash_lock); spin_lock_bh(&pstapriv->sta_hash_lock);
@ -269,7 +255,6 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info)*NUM_STA+4); rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info)*NUM_STA+4);
} }
return _SUCCESS; return _SUCCESS;
} }
@ -283,8 +268,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
int i = 0; int i = 0;
u16 wRxSeqInitialValue = 0xffff; u16 wRxSeqInitialValue = 0xffff;
pfree_sta_queue = &pstapriv->free_sta_queue; pfree_sta_queue = &pstapriv->free_sta_queue;
spin_lock_bh(&pfree_sta_queue->lock); spin_lock_bh(&pfree_sta_queue->lock);
@ -356,8 +339,6 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
exit: exit:
return psta; return psta;
} }
@ -371,8 +352,6 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
if (psta == NULL) if (psta == NULL)
goto exit; goto exit;
@ -486,8 +465,6 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
exit: exit:
return _SUCCESS; return _SUCCESS;
} }
@ -530,8 +507,6 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
u8 *addr; u8 *addr;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
if (hwaddr == NULL) if (hwaddr == NULL)
return NULL; return NULL;
@ -570,8 +545,6 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter)
unsigned char bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; unsigned char bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
psta = rtw_alloc_stainfo(pstapriv, bcast_addr); psta = rtw_alloc_stainfo(pstapriv, bcast_addr);
if (psta == NULL) { if (psta == NULL) {

1
core/rtw_wlan_util.c
View file

@ -1383,7 +1383,6 @@ void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)
else else
memcpy(supported_rates, rtw_basic_rate_ofdm, 3); memcpy(supported_rates, rtw_basic_rate_ofdm, 3);
if (wirelessmode & WIRELESS_11B) if (wirelessmode & WIRELESS_11B)
update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB); update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB);
else else

64
core/rtw_xmit.c
View file

@ -51,7 +51,6 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
_rtw_init_listhead(&psta_xmitpriv->legacy_dz); _rtw_init_listhead(&psta_xmitpriv->legacy_dz);
_rtw_init_listhead(&psta_xmitpriv->apsd); _rtw_init_listhead(&psta_xmitpriv->apsd);
} }
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
@ -63,8 +62,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
u32 num_xmit_extbuf = NR_XMIT_EXTBUFF; u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
/* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */
spin_lock_init(&pxmitpriv->lock); spin_lock_init(&pxmitpriv->lock);
@ -226,8 +223,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
exit: exit:
return res; return res;
} }
@ -654,8 +649,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
exit: exit:
return res; return res;
} }
@ -677,8 +670,6 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
else else
stainfo = rtw_get_stainfo(&padapter->stapriv , &pattrib->ra[0]); stainfo = rtw_get_stainfo(&padapter->stapriv , &pattrib->ra[0]);
hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);; hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);;
if (pattrib->encrypt == _TKIP_) {/* if (psecuritypriv->dot11PrivacyAlgrthm == _TKIP_PRIVACY_) */ if (pattrib->encrypt == _TKIP_) {/* if (psecuritypriv->dot11PrivacyAlgrthm == _TKIP_PRIVACY_) */
@ -775,8 +766,6 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
} }
} }
return _SUCCESS; return _SUCCESS;
} }
@ -784,8 +773,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
{ {
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
if (pattrib->bswenc) { if (pattrib->bswenc) {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("### xmitframe_swencrypt\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("### xmitframe_swencrypt\n"));
switch (pattrib->encrypt) { switch (pattrib->encrypt) {
@ -806,8 +793,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n"));
} }
return _SUCCESS; return _SUCCESS;
} }
@ -827,8 +812,6 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
int bmcst = IS_MCAST(pattrib->ra); int bmcst = IS_MCAST(pattrib->ra);
if (pattrib->psta) { if (pattrib->psta) {
psta = pattrib->psta; psta = pattrib->psta;
} else { } else {
@ -933,7 +916,6 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
} }
exit: exit:
return res; return res;
} }
@ -1022,8 +1004,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
s32 bmcst = IS_MCAST(pattrib->ra); s32 bmcst = IS_MCAST(pattrib->ra);
s32 res = _SUCCESS; s32 res = _SUCCESS;
psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
if (psta == NULL) if (psta == NULL)
@ -1160,8 +1140,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
exit: exit:
return res; return res;
} }
@ -1177,8 +1155,6 @@ s32 rtw_put_snap(u8 *data, u16 h_proto)
struct ieee80211_snap_hdr *snap; struct ieee80211_snap_hdr *snap;
u8 *oui; u8 *oui;
snap = (struct ieee80211_snap_hdr *)data; snap = (struct ieee80211_snap_hdr *)data;
snap->dsap = 0xaa; snap->dsap = 0xaa;
snap->ssap = 0xaa; snap->ssap = 0xaa;
@ -1195,8 +1171,6 @@ s32 rtw_put_snap(u8 *data, u16 h_proto)
*(__be16 *)(data + SNAP_SIZE) = htons(h_proto); *(__be16 *)(data + SNAP_SIZE) = htons(h_proto);
return SNAP_SIZE + sizeof(u16); return SNAP_SIZE + sizeof(u16);
} }
@ -1208,8 +1182,6 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv; struct registry_priv *pregistrypriv = &padapter->registrypriv;
switch (pxmitpriv->vcs_setting) { switch (pxmitpriv->vcs_setting) {
case DISABLE_VCS: case DISABLE_VCS:
pxmitpriv->vcs = NONE_VCS; pxmitpriv->vcs = NONE_VCS;
@ -1235,7 +1207,6 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
break; break;
} }
} }
void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz) void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz)
@ -1265,8 +1236,6 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&pfree_queue->lock, flags); spin_lock_irqsave(&pfree_queue->lock, flags);
if (_rtw_queue_empty(pfree_queue) == true) { if (_rtw_queue_empty(pfree_queue) == true) {
@ -1295,8 +1264,6 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
spin_unlock_irqrestore(&pfree_queue->lock, flags); spin_unlock_irqrestore(&pfree_queue->lock, flags);
return pxmitbuf; return pxmitbuf;
} }
@ -1305,8 +1272,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
unsigned long flags; unsigned long flags;
if (pxmitbuf == NULL) if (pxmitbuf == NULL)
return _FAIL; return _FAIL;
@ -1319,8 +1284,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
spin_unlock_irqrestore(&pfree_queue->lock, flags); spin_unlock_irqrestore(&pfree_queue->lock, flags);
return _SUCCESS; return _SUCCESS;
} }
@ -1331,8 +1294,6 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
unsigned long flags; unsigned long flags;
/* DBG_88E("+rtw_alloc_xmitbuf\n"); */ /* DBG_88E("+rtw_alloc_xmitbuf\n"); */
spin_lock_irqsave(&pfree_xmitbuf_queue->lock, flags); spin_lock_irqsave(&pfree_xmitbuf_queue->lock, flags);
@ -1359,8 +1320,6 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
} }
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags);
return pxmitbuf; return pxmitbuf;
} }
@ -1369,7 +1328,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
unsigned long flags; unsigned long flags;
if (pxmitbuf == NULL) if (pxmitbuf == NULL)
return _FAIL; return _FAIL;
@ -1391,8 +1349,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags);
} }
return _SUCCESS; return _SUCCESS;
} }
@ -1420,8 +1376,6 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
spin_lock_bh(&pfree_xmit_queue->lock); spin_lock_bh(&pfree_xmit_queue->lock);
if (_rtw_queue_empty(pfree_xmit_queue) == true) { if (_rtw_queue_empty(pfree_xmit_queue) == true) {
@ -1459,8 +1413,6 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
spin_unlock_bh(&pfree_xmit_queue->lock); spin_unlock_bh(&pfree_xmit_queue->lock);
return pxframe; return pxframe;
} }
@ -1470,8 +1422,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
struct adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
struct sk_buff *pndis_pkt = NULL; struct sk_buff *pndis_pkt = NULL;
if (pxmitframe == NULL) { if (pxmitframe == NULL) {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== rtw_free_xmitframe():pxmitframe == NULL!!!!!!!!!!\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== rtw_free_xmitframe():pxmitframe == NULL!!!!!!!!!!\n"));
goto exit; goto exit;
@ -1498,8 +1448,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
exit: exit:
return _SUCCESS; return _SUCCESS;
} }
@ -1508,8 +1456,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct xmit_frame *pxmitframe; struct xmit_frame *pxmitframe;
spin_lock_bh(&pframequeue->lock); spin_lock_bh(&pframequeue->lock);
phead = get_list_head(pframequeue); phead = get_list_head(pframequeue);
@ -1524,7 +1470,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram
} }
spin_unlock_bh(&pframequeue->lock); spin_unlock_bh(&pframequeue->lock);
} }
s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
@ -1570,8 +1515,6 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
int i, inx[4]; int i, inx[4];
inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3; inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3;
if (pregpriv->wifi_spec == 1) { if (pregpriv->wifi_spec == 1) {
@ -1618,7 +1561,6 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *
{ {
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
switch (up) { switch (up) {
case 1: case 1:
case 2: case 2:
@ -1647,8 +1589,6 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *
break; break;
} }
return ptxservq; return ptxservq;
} }
@ -1666,8 +1606,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;
int res = _SUCCESS; int res = _SUCCESS;
if (pattrib->psta) { if (pattrib->psta) {
psta = pattrib->psta; psta = pattrib->psta;
} else { } else {
@ -1691,8 +1629,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
phwxmits[ac_index].accnt++; phwxmits[ac_index].accnt++;
exit: exit:
return res; return res;
} }

1
hal/HalHWImg8188E_BB.c
View file

@ -55,7 +55,6 @@ static bool CheckCondition(const u32 condition, const u32 hex)
return true; return true;
} }
/****************************************************************************** /******************************************************************************
* AGC_TAB_1T.TXT * AGC_TAB_1T.TXT
******************************************************************************/ ******************************************************************************/

1
hal/HalHWImg8188E_MAC.c
View file

@ -47,7 +47,6 @@ static bool Checkcondition(const u32 condition, const u32 hex)
return true; return true;
} }
/****************************************************************************** /******************************************************************************
* MAC_REG.TXT * MAC_REG.TXT
******************************************************************************/ ******************************************************************************/

1
hal/HalHWImg8188E_RF.c
View file

@ -48,7 +48,6 @@ static bool CheckCondition(const u32 Condition, const u32 Hex)
return true; return true;
} }
/****************************************************************************** /******************************************************************************
* RadioA_1T.TXT * RadioA_1T.TXT
******************************************************************************/ ******************************************************************************/

4
hal/hal_intf.c
View file

@ -116,8 +116,6 @@ uint rtw_hal_deinit(struct adapter *adapt)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
status = adapt->HalFunc.hal_deinit(adapt); status = adapt->HalFunc.hal_deinit(adapt);
if (status == _SUCCESS) if (status == _SUCCESS)
@ -125,8 +123,6 @@ uint rtw_hal_deinit(struct adapter *adapt)
else else
DBG_88E("\n rtw_hal_deinit: hal_init fail\n"); DBG_88E("\n rtw_hal_deinit: hal_init fail\n");
return status; return status;
} }

5
hal/odm.c
View file

@ -167,7 +167,6 @@ u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8] = {
{0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00} /* 32, -16.0dB */ {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00} /* 32, -16.0dB */
}; };
#define RxDefaultAnt1 0x65a9 #define RxDefaultAnt1 0x65a9
#define RxDefaultAnt2 0x569a #define RxDefaultAnt2 0x569a
@ -1919,7 +1918,6 @@ void ODM_SingleDualAntennaDefaultSetting(struct odm_dm_struct *pDM_Odm)
pDM_SWAT_Table->ANTB_ON = true; pDM_SWAT_Table->ANTB_ON = true;
} }
/* 2 8723A ANT DETECT */ /* 2 8723A ANT DETECT */
static void odm_PHY_SaveAFERegisters(struct odm_dm_struct *pDM_Odm, u32 *AFEReg, u32 *AFEBackup, u32 RegisterNum) static void odm_PHY_SaveAFERegisters(struct odm_dm_struct *pDM_Odm, u32 *AFEReg, u32 *AFEBackup, u32 RegisterNum)
@ -2032,7 +2030,6 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode)
ODM_SetBBReg(pDM_Odm, rTx_IQK_Tone_A, bMaskDWord, 0x10008C1C); ODM_SetBBReg(pDM_Odm, rTx_IQK_Tone_A, bMaskDWord, 0x10008C1C);
ODM_SetBBReg(pDM_Odm, rTx_IQK, bMaskDWord, 0x01007c00); ODM_SetBBReg(pDM_Odm, rTx_IQK, bMaskDWord, 0x01007c00);
/* Page B init */ /* Page B init */
ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x00080000); ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x00080000);
ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x0f600000); ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x0f600000);
@ -2062,7 +2059,6 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode)
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, Antenna_B); /* change to Antenna B */ ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, Antenna_B); /* change to Antenna B */
ODM_StallExecution(10); ODM_StallExecution(10);
for (n = 0; n < 2; n++) { for (n = 0; n < 2; n++) {
PSD_report_tmp = GetPSDData(pDM_Odm, 14, initial_gain); PSD_report_tmp = GetPSDData(pDM_Odm, 14, initial_gain);
if (PSD_report_tmp > AntB_report) if (PSD_report_tmp > AntB_report)
@ -2100,7 +2096,6 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode)
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_B[%d]= %d\n", 2416, AntB_report)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_B[%d]= %d\n", 2416, AntB_report));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_O[%d]= %d\n", 2416, AntO_report)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_O[%d]= %d\n", 2416, AntO_report));
if (pDM_Odm->SupportICType == ODM_RTL8723A) { if (pDM_Odm->SupportICType == ODM_RTL8723A) {
/* 2 Test Ant B based on Ant A is ON */ /* 2 Test Ant B based on Ant A is ON */
if (mode == ANTTESTB) { if (mode == ANTTESTB) {

17
hal/rtl8188e_cmd.c
View file

@ -72,8 +72,6 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p
u32 h2c_cmd_ex = 0; u32 h2c_cmd_ex = 0;
s32 ret = _FAIL; s32 ret = _FAIL;
if (!adapt->bFWReady) { if (!adapt->bFWReady) {
DBG_88E("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n"); DBG_88E("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n");
return ret; return ret;
@ -125,8 +123,6 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p
exit: exit:
return ret; return ret;
} }
@ -135,7 +131,6 @@ u8 rtl8188e_set_rssi_cmd(struct adapter *adapt, u8 *param)
u8 res = _SUCCESS; u8 res = _SUCCESS;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
if (haldata->fw_ractrl) { if (haldata->fw_ractrl) {
; ;
} else { } else {
@ -143,8 +138,6 @@ u8 rtl8188e_set_rssi_cmd(struct adapter *adapt, u8 *param)
res = _FAIL; res = _FAIL;
} }
return res; return res;
} }
@ -154,7 +147,6 @@ u8 rtl8188e_set_raid_cmd(struct adapter *adapt, u32 mask)
u8 res = _SUCCESS; u8 res = _SUCCESS;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
if (haldata->fw_ractrl) { if (haldata->fw_ractrl) {
__le32 lmask; __le32 lmask;
@ -168,8 +160,6 @@ u8 rtl8188e_set_raid_cmd(struct adapter *adapt, u32 mask)
res = _FAIL; res = _FAIL;
} }
return res; return res;
} }
@ -216,7 +206,6 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)
struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv;
u8 RLBM = 0; /* 0:Min, 1:Max, 2:User define */ u8 RLBM = 0; /* 0:Min, 1:Max, 2:User define */
DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__, DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__,
Mode, pwrpriv->smart_ps, adapt->registrypriv.uapsd_enable); Mode, pwrpriv->smart_ps, adapt->registrypriv.uapsd_enable);
@ -256,7 +245,6 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)
FillH2CCmd_88E(adapt, H2C_PS_PWR_MODE, sizeof(H2CSetPwrMode), (u8 *)&H2CSetPwrMode); FillH2CCmd_88E(adapt, H2C_PS_PWR_MODE, sizeof(H2CSetPwrMode), (u8 *)&H2CSetPwrMode);
} }
void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt) void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)
@ -617,8 +605,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
u8 DLBcnCount = 0; u8 DLBcnCount = 0;
u32 poll = 0; u32 poll = 0;
DBG_88E("%s mstatus(%x)\n", __func__, mstatus); DBG_88E("%s mstatus(%x)\n", __func__, mstatus);
if (mstatus == 1) { if (mstatus == 1) {
@ -712,8 +698,6 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)
struct P2P_PS_Offload_t *p2p_ps_offload = &haldata->p2p_ps_offload; struct P2P_PS_Offload_t *p2p_ps_offload = &haldata->p2p_ps_offload;
u8 i; u8 i;
switch (p2p_ps_state) { switch (p2p_ps_state) {
case P2P_PS_DISABLE: case P2P_PS_DISABLE:
DBG_88E("P2P_PS_DISABLE\n"); DBG_88E("P2P_PS_DISABLE\n");
@ -775,5 +759,4 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)
FillH2CCmd_88E(adapt, H2C_PS_P2P_OFFLOAD, 1, (u8 *)p2p_ps_offload); FillH2CCmd_88E(adapt, H2C_PS_P2P_OFFLOAD, 1, (u8 *)p2p_ps_offload);
#endif #endif
} }

1
hal/rtl8188e_dm.c
View file

@ -81,7 +81,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PATCH_ID, hal_data->CustomerID); ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PATCH_ID, hal_data->CustomerID);
ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec); ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_BWIFI_TEST, Adapter->registrypriv.wifi_spec);
if (hal_data->rf_type == RF_1T1R) if (hal_data->rf_type == RF_1T1R)
ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_RF_TYPE, ODM_1T1R); ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_RF_TYPE, ODM_1T1R);
else if (hal_data->rf_type == RF_2T2R) else if (hal_data->rf_type == RF_2T2R)

1
hal/rtl8188e_hal_init.c
View file

@ -810,7 +810,6 @@ rtl8188e_EfusePowerSwitch(
hal_EfusePowerSwitch_RTL8188E(pAdapter, bWrite, PwrState); hal_EfusePowerSwitch_RTL8188E(pAdapter, bWrite, PwrState);
} }
static void Hal_EfuseReadEFuse88E(struct adapter *Adapter, static void Hal_EfuseReadEFuse88E(struct adapter *Adapter,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,

9
hal/rtl8188e_mp.c
View file

@ -113,7 +113,6 @@ void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, bool bInCH14)
TempVal = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][0] + TempVal = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][0] +
(CCKSwingTable_Ch1_Ch13[CCKSwingIndex][1]<<8); (CCKSwingTable_Ch1_Ch13[CCKSwingIndex][1]<<8);
/* Write 0xa24 ~ 0xa27 */ /* Write 0xa24 ~ 0xa27 */
TempVal2 = 0; TempVal2 = 0;
TempVal2 = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][2] + TempVal2 = CCKSwingTable_Ch1_Ch13[CCKSwingIndex][2] +
@ -166,7 +165,6 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven)
u8 Action = 0; /* 0: no action, 1: even->odd, 2:odd->even */ u8 Action = 0; /* 0: no action, 1: even->odd, 2:odd->even */
s32 i = 0; s32 i = 0;
if (!IS_92C_SERIAL(pHalData->VersionID)) if (!IS_92C_SERIAL(pHalData->VersionID))
return; return;
if (beven && !pMptCtx->bMptIndexEven) { if (beven && !pMptCtx->bMptIndexEven) {
@ -263,7 +261,6 @@ void Hal_SetBandwidth(struct adapter *pAdapter)
{ {
struct mp_priv *pmp = &pAdapter->mppriv; struct mp_priv *pmp = &pAdapter->mppriv;
SetBWMode(pAdapter, pmp->bandwidth, pmp->prime_channel_offset); SetBWMode(pAdapter, pmp->bandwidth, pmp->prime_channel_offset);
Hal_mpt_SwitchRfSetting(pAdapter); Hal_mpt_SwitchRfSetting(pAdapter);
} }
@ -272,7 +269,6 @@ void Hal_SetCCKTxPower(struct adapter *pAdapter, u8 *TxPower)
{ {
u32 tmpval = 0; u32 tmpval = 0;
/* rf-A cck tx power */ /* rf-A cck tx power */
write_bbreg(pAdapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, TxPower[RF_PATH_A]); write_bbreg(pAdapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, TxPower[RF_PATH_A]);
tmpval = (TxPower[RF_PATH_A]<<16) | (TxPower[RF_PATH_A]<<8) | TxPower[RF_PATH_A]; tmpval = (TxPower[RF_PATH_A]<<16) | (TxPower[RF_PATH_A]<<8) | TxPower[RF_PATH_A];
@ -406,7 +402,6 @@ void Hal_SetAntenna(struct adapter *pAdapter)
u8 chgTx = 0, chgRx = 0; u8 chgTx = 0, chgRx = 0;
u32 r_ant_select_ofdm_val = 0, r_ofdm_tx_en_val = 0; u32 r_ant_select_ofdm_val = 0, r_ofdm_tx_en_val = 0;
p_ofdm_tx = (struct ant_sel_ofdm *)&r_ant_select_ofdm_val; p_ofdm_tx = (struct ant_sel_ofdm *)&r_ant_select_ofdm_val;
p_cck_txrx = (struct ant_sel_cck *)&r_ant_select_cck_val; p_cck_txrx = (struct ant_sel_cck *)&r_ant_select_cck_val;
@ -543,7 +538,6 @@ s32 Hal_SetThermalMeter(struct adapter *pAdapter, u8 target_ther)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
if (!netif_running(pAdapter->pnetdev)) { if (!netif_running(pAdapter->pnetdev)) {
RT_TRACE(_module_mp_, _drv_warning_, ("SetThermalMeter! Fail: interface not opened!\n")); RT_TRACE(_module_mp_, _drv_warning_, ("SetThermalMeter! Fail: interface not opened!\n"));
return _FAIL; return _FAIL;
@ -626,7 +620,6 @@ void Hal_SetSingleCarrierTx(struct adapter *pAdapter, u8 bStart)
} }
} }
void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -713,8 +706,6 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart)
} }
} }
void Hal_SetCarrierSuppressionTx(struct adapter *pAdapter, u8 bStart) void Hal_SetCarrierSuppressionTx(struct adapter *pAdapter, u8 bStart)
{ {
pAdapter->mppriv.MptCtx.bCarrierSuppression = bStart; pAdapter->mppriv.MptCtx.bCarrierSuppression = bStart;

9
hal/rtl8188e_phycfg.c
View file

@ -34,12 +34,10 @@
/*---------------------------Define Local Constant---------------------------*/ /*---------------------------Define Local Constant---------------------------*/
/*------------------------Define global variable-----------------------------*/ /*------------------------Define global variable-----------------------------*/
/*------------------------Define local variable------------------------------*/ /*------------------------Define local variable------------------------------*/
/*--------------------Define export function prototype-----------------------*/ /*--------------------Define export function prototype-----------------------*/
/* Please refer to header file */ /* Please refer to header file */
/*--------------------Define export function prototype-----------------------*/ /*--------------------Define export function prototype-----------------------*/
@ -100,7 +98,6 @@ rtl8188e_PHY_QueryBBReg(
return ReturnValue; return ReturnValue;
} }
/** /**
* Function: PHY_SetBBReg * Function: PHY_SetBBReg
* *
@ -132,7 +129,6 @@ void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3
rtw_write32(Adapter, RegAddr, Data); rtw_write32(Adapter, RegAddr, Data);
} }
/* */ /* */
/* 2. RF register R/W API */ /* 2. RF register R/W API */
/* */ /* */
@ -266,7 +262,6 @@ phy_RFSerialWrite(
struct bb_reg_def *pPhyReg = &pHalData->PHYRegDef[eRFPath]; struct bb_reg_def *pPhyReg = &pHalData->PHYRegDef[eRFPath];
u32 NewOffset; u32 NewOffset;
/* 2009/06/17 MH We can not execute IO for power save or other accident mode. */ /* 2009/06/17 MH We can not execute IO for power save or other accident mode. */
Offset &= 0xff; Offset &= 0xff;
@ -601,7 +596,6 @@ PHY_BBConfig8188E(
phy_InitBBRFRegisterDefinition(Adapter); phy_InitBBRFRegisterDefinition(Adapter);
/* Enable BB and RF */ /* Enable BB and RF */
RegVal = rtw_read16(Adapter, REG_SYS_FUNC_EN); RegVal = rtw_read16(Adapter, REG_SYS_FUNC_EN);
rtw_write16(Adapter, REG_SYS_FUNC_EN, (u16)(RegVal|BIT13|BIT0|BIT1)); rtw_write16(Adapter, REG_SYS_FUNC_EN, (u16)(RegVal|BIT13|BIT0|BIT1));
@ -631,7 +625,6 @@ int PHY_RFConfig8188E(struct adapter *Adapter)
return rtStatus; return rtStatus;
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Function: PHY_ConfigRFWithParaFile() * Function: PHY_ConfigRFWithParaFile()
* *
@ -682,7 +675,6 @@ static u8 phy_DbmToTxPwrIdx(struct adapter *Adapter, enum wireless_mode Wireless
u8 TxPwrIdx = 0; u8 TxPwrIdx = 0;
int Offset = 0; int Offset = 0;
/* */ /* */
/* Tested by MP, we found that CCK Index 0 equals to 8dbm, OFDM legacy equals to */ /* Tested by MP, we found that CCK Index 0 equals to 8dbm, OFDM legacy equals to */
/* 3dbm, and OFDM HT equals to 0dbm respectively. */ /* 3dbm, and OFDM HT equals to 0dbm respectively. */
@ -748,7 +740,6 @@ static int phy_TxPwrIdxToDbm(struct adapter *Adapter, enum wireless_mode Wireles
return PwrOutDbm; return PwrOutDbm;
} }
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Function: GetTxPowerLevel8190() * Function: GetTxPowerLevel8190()
* *

3
hal/rtl8188e_rf6052.c
View file

@ -63,7 +63,6 @@ struct rf_shadow {
/*---------------------------Define Local Constant---------------------------*/ /*---------------------------Define Local Constant---------------------------*/
/*------------------------Define global variable-----------------------------*/ /*------------------------Define global variable-----------------------------*/
/*------------------------Define local variable------------------------------*/ /*------------------------Define local variable------------------------------*/
@ -90,7 +89,6 @@ void rtl8188e_RF_ChangeTxPath(struct adapter *Adapter, u16 DataRate)
/* We do not support gain table change inACUT now !!!! Delete later !!! */ /* We do not support gain table change inACUT now !!!! Delete later !!! */
} /* RF_ChangeTxPath */ } /* RF_ChangeTxPath */
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Function: PHY_RF6052SetBandwidth() * Function: PHY_RF6052SetBandwidth()
* *
@ -157,7 +155,6 @@ rtl8188e_PHY_RF6052SetCckTxPower(
/* FOR CE ,must disable turbo scan */ /* FOR CE ,must disable turbo scan */
TurboScanOff = true; TurboScanOff = true;
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
TxAGC[RF_PATH_A] = 0x3f3f3f3f; TxAGC[RF_PATH_A] = 0x3f3f3f3f;
TxAGC[RF_PATH_B] = 0x3f3f3f3f; TxAGC[RF_PATH_B] = 0x3f3f3f3f;

2
hal/rtl8188eu_recv.c
View file

@ -70,7 +70,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(precvpriv->pallocated_recv_buf), 4); precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(precvpriv->pallocated_recv_buf), 4);
precvbuf = (struct recv_buf *)precvpriv->precv_buf; precvbuf = (struct recv_buf *)precvpriv->precv_buf;
for (i = 0; i < NR_RECVBUFF; i++) { for (i = 0; i < NR_RECVBUFF; i++) {
@ -130,7 +129,6 @@ void rtl8188eu_free_recv_priv(struct adapter *padapter)
DBG_88E(KERN_WARNING "rx_skb_queue not empty\n"); DBG_88E(KERN_WARNING "rx_skb_queue not empty\n");
skb_queue_purge(&precvpriv->rx_skb_queue); skb_queue_purge(&precvpriv->rx_skb_queue);
if (skb_queue_len(&precvpriv->free_recv_skb_queue)) if (skb_queue_len(&precvpriv->free_recv_skb_queue))
DBG_88E(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue)); DBG_88E(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue));

13
hal/usb_halinit.c
View file

@ -709,8 +709,6 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
#define HAL_INIT_PROFILE_TAG(stage) do {} while (0) #define HAL_INIT_PROFILE_TAG(stage) do {} while (0)
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
if (Adapter->pwrctrlpriv.bkeepfwalive) { if (Adapter->pwrctrlpriv.bkeepfwalive) {
@ -967,8 +965,6 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
DBG_88E("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time)); DBG_88E("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time));
return status; return status;
} }
@ -1084,8 +1080,6 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
struct recv_priv *precvpriv = &(Adapter->recvpriv); struct recv_priv *precvpriv = &(Adapter->recvpriv);
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
_read_port = pintfhdl->io_ops._read_port; _read_port = pintfhdl->io_ops._read_port;
status = _SUCCESS; status = _SUCCESS;
@ -1112,8 +1106,6 @@ exit:
RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("<=== usb_inirp_init\n")); RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("<=== usb_inirp_init\n"));
return status; return status;
} }
@ -1403,7 +1395,6 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
struct dm_priv *pdmpriv = &haldata->dmpriv; struct dm_priv *pdmpriv = &haldata->dmpriv;
struct odm_dm_struct *podmpriv = &haldata->odmpriv; struct odm_dm_struct *podmpriv = &haldata->odmpriv;
switch (variable) { switch (variable) {
case HW_VAR_MEDIA_STATUS: case HW_VAR_MEDIA_STATUS:
{ {
@ -1929,7 +1920,6 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
struct odm_dm_struct *podmpriv = &haldata->odmpriv; struct odm_dm_struct *podmpriv = &haldata->odmpriv;
switch (variable) { switch (variable) {
case HW_VAR_BASIC_RATE: case HW_VAR_BASIC_RATE:
*((u16 *)(val)) = haldata->BasicRateSet; *((u16 *)(val)) = haldata->BasicRateSet;
@ -1980,7 +1970,6 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
break; break;
} }
} }
/* */ /* */
@ -2302,8 +2291,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
{ {
struct hal_ops *halfunc = &adapt->HalFunc; struct hal_ops *halfunc = &adapt->HalFunc;
adapt->HalData = rtw_zmalloc(sizeof(struct hal_data_8188e)); adapt->HalData = rtw_zmalloc(sizeof(struct hal_data_8188e));
if (adapt->HalData == NULL) if (adapt->HalData == NULL)
DBG_88E("cant not alloc memory for HAL DATA\n"); DBG_88E("cant not alloc memory for HAL DATA\n");

9
hal/usb_ops_linux.c
View file

@ -151,7 +151,6 @@ static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
u16 len; u16 len;
__le32 data; __le32 data;
request = 0x05; request = 0x05;
requesttype = 0x01;/* read_in */ requesttype = 0x01;/* read_in */
index = 0;/* n/a */ index = 0;/* n/a */
@ -159,7 +158,6 @@ static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
len = 2; len = 2;
usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
return (u16)(le32_to_cpu(data)&0xffff); return (u16)(le32_to_cpu(data)&0xffff);
} }
@ -172,8 +170,6 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
u16 len; u16 len;
__le32 data; __le32 data;
request = 0x05; request = 0x05;
requesttype = 0x01;/* read_in */ requesttype = 0x01;/* read_in */
index = 0;/* n/a */ index = 0;/* n/a */
@ -183,8 +179,6 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
return le32_to_cpu(data); return le32_to_cpu(data);
} }
@ -595,8 +589,6 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
size_t alignment = 0; size_t alignment = 0;
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
if (adapter->bDriverStopped || adapter->bSurpriseRemoved || if (adapter->bDriverStopped || adapter->bSurpriseRemoved ||
adapter->pwrctrlpriv.pnp_bstop_trx) { adapter->pwrctrlpriv.pnp_bstop_trx) {
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
@ -669,7 +661,6 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
ret = _FAIL; ret = _FAIL;
} }
return ret; return ret;
} }

6
include/Hal8188EPhyCfg.h
View file

@ -20,7 +20,6 @@
#ifndef __INC_HAL8188EPHYCFG_H__ #ifndef __INC_HAL8188EPHYCFG_H__
#define __INC_HAL8188EPHYCFG_H__ #define __INC_HAL8188EPHYCFG_H__
/*--------------------------Define Parameters-------------------------------*/ /*--------------------------Define Parameters-------------------------------*/
#define LOOP_LIMIT 5 #define LOOP_LIMIT 5
#define MAX_STALL_TIME 50 /* us */ #define MAX_STALL_TIME 50 /* us */
@ -35,10 +34,8 @@
#define MAX_AGGR_NUM 0x07 #define MAX_AGGR_NUM 0x07
/*--------------------------Define Parameters-------------------------------*/ /*--------------------------Define Parameters-------------------------------*/
/*------------------------------Define structure----------------------------*/ /*------------------------------Define structure----------------------------*/
enum sw_chnl_cmd_id { enum sw_chnl_cmd_id {
CmdID_End, CmdID_End,
@ -185,15 +182,12 @@ struct ant_sel_cck {
/*------------------------------Define structure----------------------------*/ /*------------------------------Define structure----------------------------*/
/*------------------------Export global variable----------------------------*/ /*------------------------Export global variable----------------------------*/
/*------------------------Export global variable----------------------------*/ /*------------------------Export global variable----------------------------*/
/*------------------------Export Marco Definition---------------------------*/ /*------------------------Export Marco Definition---------------------------*/
/*------------------------Export Marco Definition---------------------------*/ /*------------------------Export Marco Definition---------------------------*/
/*--------------------------Exported Function prototype---------------------*/ /*--------------------------Exported Function prototype---------------------*/
/* */ /* */
/* BB and RF register read/write */ /* BB and RF register read/write */

6
include/Hal8188EPhyReg.h
View file

@ -29,7 +29,6 @@
/* 5. Other definition for BB/RF R/W */ /* 5. Other definition for BB/RF R/W */
/* */ /* */
/* */ /* */
/* 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF */ /* 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF */
/* 1. Page1(0x100) */ /* 1. Page1(0x100) */
@ -237,7 +236,6 @@
#define rOFDM0_FrameSync 0xcf0 #define rOFDM0_FrameSync 0xcf0
#define rOFDM0_DFSReport 0xcf4 #define rOFDM0_DFSReport 0xcf4
/* */ /* */
/* 7. PageD(0xD00) */ /* 7. PageD(0xD00) */
/* */ /* */
@ -273,7 +271,6 @@
#define rOFDM_RxEVMCSI 0xdd8 #define rOFDM_RxEVMCSI 0xdd8
#define rOFDM_SIGReport 0xddc #define rOFDM_SIGReport 0xddc
/* */ /* */
/* 8. PageE(0xE00) */ /* 8. PageE(0xE00) */
/* */ /* */
@ -449,7 +446,6 @@
#define RF_0x52 0x52 #define RF_0x52 0x52
#define RF_WE_LUT 0xEF #define RF_WE_LUT 0xEF
/* */ /* */
/* Bit Mask */ /* Bit Mask */
/* */ /* */
@ -1028,7 +1024,6 @@
#define bRTL8258_RxLPFBW 0xc00 #define bRTL8258_RxLPFBW 0xc00
#define bRTL8258_RSSILPFBW 0xc0 #define bRTL8258_RSSILPFBW 0xc0
/* */ /* */
/* Other Definition */ /* Other Definition */
/* */ /* */
@ -1090,5 +1085,4 @@
/*--------------------------Define Parameters-------------------------------*/ /*--------------------------Define Parameters-------------------------------*/
#endif #endif

3
include/Hal8188EPwrSeq.h
View file

@ -57,7 +57,6 @@
#define RTL8188E_TRANS_LPS_TO_ACT_STEPS 15 #define RTL8188E_TRANS_LPS_TO_ACT_STEPS 15
#define RTL8188E_TRANS_END_STEPS 1 #define RTL8188E_TRANS_END_STEPS 1
#define RTL8188E_TRANS_CARDEMU_TO_ACT \ #define RTL8188E_TRANS_CARDEMU_TO_ACT \
/* format */ \ /* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here*/ \ /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here*/ \
@ -141,7 +140,6 @@
{0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0},/*check if removed later*/ \ {0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT1, 0},/*check if removed later*/ \
{0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT5, BIT5},/*Respond TxOK to scheduler*/ \ {0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT5, BIT5},/*Respond TxOK to scheduler*/ \
#define RTL8188E_TRANS_LPS_TO_ACT \ #define RTL8188E_TRANS_LPS_TO_ACT \
/* format */ \ /* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here */ \ /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here */ \
@ -162,7 +160,6 @@
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here*/ \ /* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here*/ \
{0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,0, PWR_CMD_END, 0, 0}, /* */ {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,0, PWR_CMD_END, 0, 0}, /* */
extern struct wl_pwr_cfg rtl8188E_power_on_flow[RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS+RTL8188E_TRANS_END_STEPS]; extern struct wl_pwr_cfg rtl8188E_power_on_flow[RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS+RTL8188E_TRANS_END_STEPS];
extern struct wl_pwr_cfg rtl8188E_radio_off_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS+RTL8188E_TRANS_END_STEPS]; extern struct wl_pwr_cfg rtl8188E_radio_off_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS+RTL8188E_TRANS_END_STEPS];
extern struct wl_pwr_cfg rtl8188E_card_disable_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS+RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS+RTL8188E_TRANS_END_STEPS]; extern struct wl_pwr_cfg rtl8188E_card_disable_flow[RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS+RTL8188E_TRANS_CARDEMU_TO_PDN_STEPS+RTL8188E_TRANS_END_STEPS];

2
include/Hal8188EReg.h
View file

@ -36,11 +36,9 @@
#define RX_ANTDIV_PATH 0xb2c #define RX_ANTDIV_PATH 0xb2c
#define ODM_R_A_AGC_CORE1_8188E 0xc50 #define ODM_R_A_AGC_CORE1_8188E 0xc50
/* */ /* */
/* Bitmap Definition */ /* Bitmap Definition */
/* */ /* */
#define BIT_FA_RESET_8188E BIT0 #define BIT_FA_RESET_8188E BIT0
#endif #endif

1
include/HalHWImg8188E_FW.h
View file

@ -21,7 +21,6 @@
#ifndef __INC_FW_8188E_HW_IMG_H #ifndef __INC_FW_8188E_HW_IMG_H
#define __INC_FW_8188E_HW_IMG_H #define __INC_FW_8188E_HW_IMG_H
/****************************************************************************** /******************************************************************************
* FW_AP.TXT * FW_AP.TXT
******************************************************************************/ ******************************************************************************/

3
include/HalPhyRf_8188e.h
View file

@ -26,17 +26,14 @@
#define index_mapping_NUM_88E 15 #define index_mapping_NUM_88E 15
#define AVG_THERMAL_NUM_88E 4 #define AVG_THERMAL_NUM_88E 4
void ODM_TxPwrTrackAdjust88E(struct odm_dm_struct *pDM_Odm, void ODM_TxPwrTrackAdjust88E(struct odm_dm_struct *pDM_Odm,
u8 Type, /* 0 = OFDM, 1 = CCK */ u8 Type, /* 0 = OFDM, 1 = CCK */
u8 *pDirection,/* 1 = +(incr) 2 = -(decr) */ u8 *pDirection,/* 1 = +(incr) 2 = -(decr) */
u32 *pOutWriteVal); /* Tx tracking CCK/OFDM BB u32 *pOutWriteVal); /* Tx tracking CCK/OFDM BB
* swing index adjust */ * swing index adjust */
void odm_TXPowerTrackingCallback_ThermalMeter_8188E(struct adapter *Adapter); void odm_TXPowerTrackingCallback_ThermalMeter_8188E(struct adapter *Adapter);
/* 1 7. IQK */ /* 1 7. IQK */
void PHY_IQCalibrate_8188E(struct adapter *Adapter, bool ReCovery); void PHY_IQCalibrate_8188E(struct adapter *Adapter, bool ReCovery);

2
include/HalPwrSeqCmd.h
View file

@ -94,7 +94,6 @@
#define PWR_CUT_G_MSK BIT(7) #define PWR_CUT_G_MSK BIT(7)
#define PWR_CUT_ALL_MSK 0xFF #define PWR_CUT_ALL_MSK 0xFF
enum pwrseq_cmd_delat_unit { enum pwrseq_cmd_delat_unit {
PWRSEQ_DELAY_US, PWRSEQ_DELAY_US,
PWRSEQ_DELAY_MS, PWRSEQ_DELAY_MS,
@ -120,7 +119,6 @@ struct wl_pwr_cfg {
#define GET_PWR_CFG_MASK(__PWR_CMD) __PWR_CMD.msk #define GET_PWR_CFG_MASK(__PWR_CMD) __PWR_CMD.msk
#define GET_PWR_CFG_VALUE(__PWR_CMD) __PWR_CMD.value #define GET_PWR_CFG_VALUE(__PWR_CMD) __PWR_CMD.value
/* Prototype of protected function. */ /* Prototype of protected function. */
u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 CutVersion, u8 FabVersion, u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 CutVersion, u8 FabVersion,
u8 InterfaceType, struct wl_pwr_cfg PwrCfgCmd[]); u8 InterfaceType, struct wl_pwr_cfg PwrCfgCmd[]);

1
include/HalVerDef.h
View file

@ -115,7 +115,6 @@ struct HAL_VERSION {
#define IS_E_CUT(version) \ #define IS_E_CUT(version) \
((GET_CVID_CUT_VERSION(version) == E_CUT_VERSION) ? true : false) ((GET_CVID_CUT_VERSION(version) == E_CUT_VERSION) ? true : false)
/* HAL_VENDOR_E */ /* HAL_VENDOR_E */
#define IS_CHIP_VENDOR_TSMC(version) \ #define IS_CHIP_VENDOR_TSMC(version) \
((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_TSMC) ? true : false) ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_TSMC) ? true : false)

1
include/drv_types.h
View file

@ -23,7 +23,6 @@
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef __DRV_TYPES_H__ #ifndef __DRV_TYPES_H__
#define __DRV_TYPES_H__ #define __DRV_TYPES_H__

1
include/drv_types_linux.h
View file

@ -20,5 +20,4 @@
#ifndef __DRV_TYPES_LINUX_H__ #ifndef __DRV_TYPES_LINUX_H__
#define __DRV_TYPES_LINUX_H__ #define __DRV_TYPES_LINUX_H__
#endif #endif

1
include/ethernet.h
View file

@ -38,5 +38,4 @@
((u8 *)(_addr))[4] == 0xff && \ ((u8 *)(_addr))[4] == 0xff && \
((u8 *)(_addr))[5] == 0xff) /* Is Broadcast Address? */ ((u8 *)(_addr))[5] == 0xff) /* Is Broadcast Address? */
#endif /* #ifndef __INC_ETHERNET_H */ #endif /* #ifndef __INC_ETHERNET_H */

3
include/h2clbk.h
View file

@ -18,14 +18,11 @@
* *
******************************************************************************/ ******************************************************************************/
#define _H2CLBK_H_ #define _H2CLBK_H_
#include <rtl8711_spec.h> #include <rtl8711_spec.h>
#include <TypeDef.h> #include <TypeDef.h>
void _lbk_cmd(struct adapter *adapter); void _lbk_cmd(struct adapter *adapter);
void _lbk_rsp(struct adapter *adapter); void _lbk_rsp(struct adapter *adapter);

1
include/hal_com.h
View file

@ -150,7 +150,6 @@
#include "HalVerDef.h" #include "HalVerDef.h"
void dump_chip_info(struct HAL_VERSION ChipVersion); void dump_chip_info(struct HAL_VERSION ChipVersion);
/* return the final channel plan decision */ /* return the final channel plan decision */
u8 hal_com_get_channel_plan(struct adapter *padapter, u8 hal_com_get_channel_plan(struct adapter *padapter,
u8 hw_channel_plan, u8 hw_channel_plan,

13
include/ieee80211.h
View file

@ -109,7 +109,6 @@ enum {
#define IEEE_CRYPT_ERR_TX_KEY_SET_FAILED 6 #define IEEE_CRYPT_ERR_TX_KEY_SET_FAILED 6
#define IEEE_CRYPT_ERR_CARD_CONF_FAILED 7 #define IEEE_CRYPT_ERR_CARD_CONF_FAILED 7
#define IEEE_CRYPT_ALG_NAME_LEN 16 #define IEEE_CRYPT_ALG_NAME_LEN 16
#define WPA_CIPHER_NONE BIT(0) #define WPA_CIPHER_NONE BIT(0)
@ -119,7 +118,6 @@ enum {
#define WPA_CIPHER_CCMP BIT(4) #define WPA_CIPHER_CCMP BIT(4)
#define WPA_SELECTOR_LEN 4 #define WPA_SELECTOR_LEN 4
extern u8 RTW_WPA_OUI_TYPE[]; extern u8 RTW_WPA_OUI_TYPE[];
extern u16 RTW_WPA_VERSION; extern u16 RTW_WPA_VERSION;
@ -133,7 +131,6 @@ extern u8 WPA_CIPHER_SUITE_WRAP[];
extern u8 WPA_CIPHER_SUITE_CCMP[]; extern u8 WPA_CIPHER_SUITE_CCMP[];
extern u8 WPA_CIPHER_SUITE_WEP104[]; extern u8 WPA_CIPHER_SUITE_WEP104[];
#define RSN_HEADER_LEN 4 #define RSN_HEADER_LEN 4
#define RSN_SELECTOR_LEN 4 #define RSN_SELECTOR_LEN 4
@ -212,7 +209,6 @@ enum NETWORK_TYPE {
#define IsSupportedTxMCS(NetType) \ #define IsSupportedTxMCS(NetType) \
((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false)
struct ieee_param { struct ieee_param {
u32 cmd; u32 cmd;
u8 sta_addr[ETH_ALEN]; u8 sta_addr[ETH_ALEN];
@ -289,11 +285,9 @@ struct sta_data {
represents the 2304 bytes of real data, plus a possible 8 bytes of represents the 2304 bytes of real data, plus a possible 8 bytes of
WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */ WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
#define IEEE80211_HLEN 30 #define IEEE80211_HLEN 30
#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) #define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)
/* this is stolen from ipw2200 driver */ /* this is stolen from ipw2200 driver */
#define IEEE_IBSS_MAC_HASH_SIZE 31 #define IEEE_IBSS_MAC_HASH_SIZE 31
@ -434,7 +428,6 @@ enum eap_type {
#define RTW_IEEE80211_SCTL_FRAG 0x000F #define RTW_IEEE80211_SCTL_FRAG 0x000F
#define RTW_IEEE80211_SCTL_SEQ 0xFFF0 #define RTW_IEEE80211_SCTL_SEQ 0xFFF0
#define RTW_ERP_INFO_NON_ERP_PRESENT BIT(0) #define RTW_ERP_INFO_NON_ERP_PRESENT BIT(0)
#define RTW_ERP_INFO_USE_PROTECTION BIT(1) #define RTW_ERP_INFO_USE_PROTECTION BIT(1)
#define RTW_ERP_INFO_BARKER_PREAMBLE_MODE BIT(2) #define RTW_ERP_INFO_BARKER_PREAMBLE_MODE BIT(2)
@ -566,14 +559,12 @@ struct ieee80211_snap_hdr {
#define IEEE80211_DATA_HDR3_LEN 24 #define IEEE80211_DATA_HDR3_LEN 24
#define IEEE80211_DATA_HDR4_LEN 30 #define IEEE80211_DATA_HDR4_LEN 30
#define IEEE80211_STATMASK_SIGNAL (1<<0) #define IEEE80211_STATMASK_SIGNAL (1<<0)
#define IEEE80211_STATMASK_RSSI (1<<1) #define IEEE80211_STATMASK_RSSI (1<<1)
#define IEEE80211_STATMASK_NOISE (1<<2) #define IEEE80211_STATMASK_NOISE (1<<2)
#define IEEE80211_STATMASK_RATE (1<<3) #define IEEE80211_STATMASK_RATE (1<<3)
#define IEEE80211_STATMASK_WEMASK 0x7 #define IEEE80211_STATMASK_WEMASK 0x7
#define IEEE80211_CCK_MODULATION (1<<0) #define IEEE80211_CCK_MODULATION (1<<0)
#define IEEE80211_OFDM_MODULATION (1<<1) #define IEEE80211_OFDM_MODULATION (1<<1)
@ -583,7 +574,6 @@ struct ieee80211_snap_hdr {
#define IEEE80211_CCK_RATE_LEN 4 #define IEEE80211_CCK_RATE_LEN 4
#define IEEE80211_NUM_OFDM_RATESLEN 8 #define IEEE80211_NUM_OFDM_RATESLEN 8
#define IEEE80211_CCK_RATE_1MB 0x02 #define IEEE80211_CCK_RATE_1MB 0x02
#define IEEE80211_CCK_RATE_2MB 0x04 #define IEEE80211_CCK_RATE_2MB 0x04
#define IEEE80211_CCK_RATE_5MB 0x0B #define IEEE80211_CCK_RATE_5MB 0x0B
@ -861,7 +851,6 @@ struct ieee80211_txb {
struct sk_buff *fragments[0]; struct sk_buff *fragments[0];
}; };
/* SWEEP TABLE ENTRIES NUMBER*/ /* SWEEP TABLE ENTRIES NUMBER*/
#define MAX_SWEEP_TAB_ENTRIES 42 #define MAX_SWEEP_TAB_ENTRIES 42
#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7 #define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7
@ -1068,7 +1057,6 @@ enum rtw_ieee80211_back_parties {
#define WME_TSPEC_DIRECTION_DOWNLINK 1 #define WME_TSPEC_DIRECTION_DOWNLINK 1
#define WME_TSPEC_DIRECTION_BI_DIRECTIONAL 3 #define WME_TSPEC_DIRECTION_BI_DIRECTIONAL 3
#define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */ #define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */
#define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */ #define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */
@ -1251,7 +1239,6 @@ uint rtw_get_rateset_len(u8 *rateset);
struct registry_priv; struct registry_priv;
int rtw_generate_ie(struct registry_priv *pregistrypriv); int rtw_generate_ie(struct registry_priv *pregistrypriv);
int rtw_get_bit_value_from_ieee_value(u8 val); int rtw_get_bit_value_from_ieee_value(u8 val);
uint rtw_is_cckrates_included(u8 *rate); uint rtw_is_cckrates_included(u8 *rate);

3
include/ieee80211_ext.h
View file

@ -38,15 +38,12 @@
#define WPA_KEY_MGMT_IEEE8021X_NO_WPA BIT(3) #define WPA_KEY_MGMT_IEEE8021X_NO_WPA BIT(3)
#define WPA_KEY_MGMT_WPA_NONE BIT(4) #define WPA_KEY_MGMT_WPA_NONE BIT(4)
#define WPA_CAPABILITY_PREAUTH BIT(0) #define WPA_CAPABILITY_PREAUTH BIT(0)
#define WPA_CAPABILITY_MGMT_FRAME_PROTECTION BIT(6) #define WPA_CAPABILITY_MGMT_FRAME_PROTECTION BIT(6)
#define WPA_CAPABILITY_PEERKEY_ENABLED BIT(9) #define WPA_CAPABILITY_PEERKEY_ENABLED BIT(9)
#define PMKID_LEN 16 #define PMKID_LEN 16
struct wpa_ie_hdr { struct wpa_ie_hdr {
u8 elem_id; u8 elem_id;
u8 len; u8 len;

1
include/ip.h
View file

@ -40,7 +40,6 @@
#define IPTOS_PREC_PRIORITY 0x20 #define IPTOS_PREC_PRIORITY 0x20
#define IPTOS_PREC_ROUTINE 0x00 #define IPTOS_PREC_ROUTINE 0x00
/* IP options */ /* IP options */
#define IPOPT_COPY 0x80 #define IPOPT_COPY 0x80
#define IPOPT_CLASS_MASK 0x60 #define IPOPT_CLASS_MASK 0x60

3
include/mp_custom_oid.h
View file

@ -96,7 +96,6 @@
#define OID_RT_PRO_SET_SINGLE_TONE_TX 0xFF818043 #define OID_RT_PRO_SET_SINGLE_TONE_TX 0xFF818043
/* */ /* */
/* by Owen for RTL8185 Phy Status Report Utility */ /* by Owen for RTL8185 Phy Status Report Utility */
#define OID_RT_UTILITY_false_ALARM_COUNTERS 0xFF818580 #define OID_RT_UTILITY_false_ALARM_COUNTERS 0xFF818580
#define OID_RT_UTILITY_SELECT_DEBUG_MODE 0xFF818581 #define OID_RT_UTILITY_SELECT_DEBUG_MODE 0xFF818581
@ -254,7 +253,6 @@
#define OID_RT_RD_ATTRIB_MEM 0xFF87110C/* Q */ #define OID_RT_RD_ATTRIB_MEM 0xFF87110C/* Q */
#define OID_RT_WR_ATTRIB_MEM 0xFF87110D/* S */ #define OID_RT_WR_ATTRIB_MEM 0xFF87110D/* S */
/* Method 2 for H2C/C2H */ /* Method 2 for H2C/C2H */
#define OID_RT_PRO_H2C_CMD_MODE 0xFF871110 /* S */ #define OID_RT_PRO_H2C_CMD_MODE 0xFF871110 /* S */
#define OID_RT_PRO_H2C_CMD_RSP_MODE 0xFF871111 /* Q */ #define OID_RT_PRO_H2C_CMD_RSP_MODE 0xFF871111 /* Q */
@ -282,7 +280,6 @@
#define OID_RT_PRO_READ_TSSI 0xFF871123/* S */ #define OID_RT_PRO_READ_TSSI 0xFF871123/* S */
#define OID_RT_PRO_SET_POWER_TRACKING 0xFF871124/* S */ #define OID_RT_PRO_SET_POWER_TRACKING 0xFF871124/* S */
#define OID_RT_PRO_QRY_PWRSTATE 0xFF871150 /* Q */ #define OID_RT_PRO_QRY_PWRSTATE 0xFF871150 /* Q */
#define OID_RT_PRO_SET_PWRSTATE 0xFF871151 /* S */ #define OID_RT_PRO_SET_PWRSTATE 0xFF871151 /* S */

3
include/nic_spec.h
View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#ifndef __NIC_SPEC_H__ #ifndef __NIC_SPEC_H__
#define __NIC_SPEC_H__ #define __NIC_SPEC_H__
@ -35,10 +34,8 @@
#define RTL8711_SYSCTRL_ (0x620000) #define RTL8711_SYSCTRL_ (0x620000)
#define RTL8711_MCCTRL_ (0x020000) #define RTL8711_MCCTRL_ (0x020000)
#include <rtl8711_regdef.h> #include <rtl8711_regdef.h>
#include <rtl8711_bitdef.h> #include <rtl8711_bitdef.h>
#endif /* __RTL8711_SPEC_H__ */ #endif /* __RTL8711_SPEC_H__ */

5
include/odm.h
View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#ifndef __HALDMOUTSRC_H__ #ifndef __HALDMOUTSRC_H__
#define __HALDMOUTSRC_H__ #define __HALDMOUTSRC_H__
@ -53,7 +52,6 @@
#define DPK_DELTA_MAPPING_NUM 13 #define DPK_DELTA_MAPPING_NUM 13
#define index_mapping_HP_NUM 15 #define index_mapping_HP_NUM 15
/* */ /* */
/* 3 PSD Handler */ /* 3 PSD Handler */
/* 3============================================================ */ /* 3============================================================ */
@ -1004,7 +1002,6 @@ enum dm_dig_op {
#define DM_SCAN_RSSI_TH 0x14 /* scan return issue for LC */ #define DM_SCAN_RSSI_TH 0x14 /* scan return issue for LC */
#define DM_false_ALARM_THRESH_LOW 400 #define DM_false_ALARM_THRESH_LOW 400
#define DM_false_ALARM_THRESH_HIGH 1000 #define DM_false_ALARM_THRESH_HIGH 1000
@ -1082,7 +1079,6 @@ enum dm_dig_op {
/* 3 BB Power Save */ /* 3 BB Power Save */
/* 3=========================================================== */ /* 3=========================================================== */
enum dm_1r_cca { enum dm_1r_cca {
CCA_1R = 0, CCA_1R = 0,
CCA_2R = 1, CCA_2R = 1,
@ -1133,7 +1129,6 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres);
void ODM_SetAntenna(struct odm_dm_struct *pDM_Odm, u8 Antenna); void ODM_SetAntenna(struct odm_dm_struct *pDM_Odm, u8 Antenna);
#define dm_RF_Saving ODM_RF_Saving #define dm_RF_Saving ODM_RF_Saving
void ODM_RF_Saving(struct odm_dm_struct *pDM_Odm, u8 bForceInNormal); void ODM_RF_Saving(struct odm_dm_struct *pDM_Odm, u8 bForceInNormal);

8
include/odm_RegDefine11AC.h
View file

@ -23,8 +23,6 @@
/* 2 RF REG LIST */ /* 2 RF REG LIST */
/* 2 BB REG LIST */ /* 2 BB REG LIST */
/* PAGE 8 */ /* PAGE 8 */
/* PAGE 9 */ /* PAGE 9 */
@ -40,15 +38,9 @@
/* PAGE F */ /* PAGE F */
#define ODM_REG_OFDM_FA_11AC 0xF48 #define ODM_REG_OFDM_FA_11AC 0xF48
/* 2 MAC REG LIST */ /* 2 MAC REG LIST */
/* DIG Related */ /* DIG Related */
#define ODM_BIT_IGI_11AC 0xFFFFFFFF #define ODM_BIT_IGI_11AC 0xFFFFFFFF
#endif #endif

11
include/odm_RegDefine11N.h
View file

@ -21,7 +21,6 @@
#ifndef __ODM_REGDEFINE11N_H__ #ifndef __ODM_REGDEFINE11N_H__
#define __ODM_REGDEFINE11N_H__ #define __ODM_REGDEFINE11N_H__
/* 2 RF REG LIST */ /* 2 RF REG LIST */
#define ODM_REG_RF_MODE_11N 0x00 #define ODM_REG_RF_MODE_11N 0x00
#define ODM_REG_RF_0B_11N 0x0B #define ODM_REG_RF_0B_11N 0x0B
@ -36,8 +35,6 @@
#define ODM_REG_T_METER_92D_11N 0x42 #define ODM_REG_T_METER_92D_11N 0x42
#define ODM_REG_T_METER_88E_11N 0x42 #define ODM_REG_T_METER_88E_11N 0x42
/* 2 BB REG LIST */ /* 2 BB REG LIST */
/* PAGE 8 */ /* PAGE 8 */
#define ODM_REG_BB_CTRL_11N 0x800 #define ODM_REG_BB_CTRL_11N 0x800
@ -143,12 +140,6 @@
#define ODM_REG_SLEEP_11N 0xEE0 #define ODM_REG_SLEEP_11N 0xEE0
#define ODM_REG_PMPD_ANAEN_11N 0xEEC #define ODM_REG_PMPD_ANAEN_11N 0xEEC
/* 2 MAC REG LIST */ /* 2 MAC REG LIST */
#define ODM_REG_BB_RST_11N 0x02 #define ODM_REG_BB_RST_11N 0x02
#define ODM_REG_ANTSEL_PIN_11N 0x4C #define ODM_REG_ANTSEL_PIN_11N 0x4C
@ -163,9 +154,7 @@
#define ODM_REG_ANT_TRAIN_PARA1_11N 0x7b0 #define ODM_REG_ANT_TRAIN_PARA1_11N 0x7b0
#define ODM_REG_ANT_TRAIN_PARA2_11N 0x7b4 #define ODM_REG_ANT_TRAIN_PARA2_11N 0x7b4
/* DIG Related */ /* DIG Related */
#define ODM_BIT_IGI_11N 0x0000007F #define ODM_BIT_IGI_11N 0x0000007F
#endif #endif

2
include/odm_debug.h
View file

@ -18,11 +18,9 @@
* *
******************************************************************************/ ******************************************************************************/
#ifndef __ODM_DBG_H__ #ifndef __ODM_DBG_H__
#define __ODM_DBG_H__ #define __ODM_DBG_H__
/* */ /* */
/* Define the debug levels */ /* Define the debug levels */
/* */ /* */

3
include/odm_reg.h
View file

@ -107,13 +107,10 @@
#define PATHDIV_REG 0xB30 #define PATHDIV_REG 0xB30
#define PATHDIV_TRI 0xBA0 #define PATHDIV_TRI 0xBA0
/* */ /* */
/* Bitmap Definition */ /* Bitmap Definition */
/* */ /* */
#define BIT_FA_RESET BIT0 #define BIT_FA_RESET BIT0
#endif #endif

1
include/odm_types.h
View file

@ -58,5 +58,4 @@ enum RT_SPINLOCK_TYPE {
#define BT_30_SUPPORT 0 #define BT_30_SUPPORT 0
#define FPGA_TWO_MAC_VERIFICATION 0 #define FPGA_TWO_MAC_VERIFICATION 0
#endif /* __ODM_TYPES_H__ */ #endif /* __ODM_TYPES_H__ */

3
include/osdep_service.h
View file

@ -75,11 +75,9 @@ static inline struct list_head *get_list_head(struct __queue *queue)
return (&(queue->queue)); return (&(queue->queue));
} }
#define LIST_CONTAINOR(ptr, type, member) \ #define LIST_CONTAINOR(ptr, type, member) \
((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member)))
static inline int _enter_critical_mutex(struct mutex *pmutex, unsigned long *pirqL) static inline int _enter_critical_mutex(struct mutex *pmutex, unsigned long *pirqL)
{ {
int ret; int ret;
@ -88,7 +86,6 @@ static inline int _enter_critical_mutex(struct mutex *pmutex, unsigned long *pir
return ret; return ret;
} }
static inline void _exit_critical_mutex(struct mutex *pmutex, unsigned long *pirqL) static inline void _exit_critical_mutex(struct mutex *pmutex, unsigned long *pirqL)
{ {
mutex_unlock(pmutex); mutex_unlock(pmutex);

2
include/recv_osdep.h
View file

@ -23,11 +23,9 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
void _rtw_free_recv_priv(struct recv_priv *precvpriv); void _rtw_free_recv_priv(struct recv_priv *precvpriv);
s32 rtw_recv_entry(union recv_frame *precv_frame); s32 rtw_recv_entry(union recv_frame *precv_frame);
int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *recv_frame); int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *recv_frame);
void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *retpkt); void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *retpkt);

5
include/rtl8188e_hal.h
View file

@ -20,7 +20,6 @@
#ifndef __RTL8188E_HAL_H__ #ifndef __RTL8188E_HAL_H__
#define __RTL8188E_HAL_H__ #define __RTL8188E_HAL_H__
/* include HAL Related header after HAL Related compiling flags */ /* include HAL Related header after HAL Related compiling flags */
#include "rtl8188e_spec.h" #include "rtl8188e_spec.h"
#include "Hal8188EPhyReg.h" #include "Hal8188EPhyReg.h"
@ -127,7 +126,6 @@ enum usb_rx_agg_mode {
#define MAX_TX_REPORT_BUFFER_SIZE 0x0400 /* 1k */ #define MAX_TX_REPORT_BUFFER_SIZE 0x0400 /* 1k */
/* BK, BE, VI, VO, HCCA, MANAGEMENT, COMMAND, HIGH, BEACON. */ /* BK, BE, VI, VO, HCCA, MANAGEMENT, COMMAND, HIGH, BEACON. */
#define MAX_TX_QUEUE 9 #define MAX_TX_QUEUE 9
@ -314,7 +312,6 @@ struct hal_data_8188e {
u8 CurrentBW2024GTxPwrIdx; u8 CurrentBW2024GTxPwrIdx;
u8 CurrentBW4024GTxPwrIdx; u8 CurrentBW4024GTxPwrIdx;
/* Read/write are allow for following hardware information variables */ /* Read/write are allow for following hardware information variables */
u8 framesync; u8 framesync;
u32 framesyncC34; u32 framesyncC34;
@ -362,7 +359,6 @@ struct hal_data_8188e {
u8 AntDivCfg; u8 AntDivCfg;
u8 TRxAntDivType; u8 TRxAntDivType;
u8 bDumpRxPkt;/* for debug */ u8 bDumpRxPkt;/* for debug */
u8 bDumpTxPkt;/* for debug */ u8 bDumpTxPkt;/* for debug */
u8 FwRsvdPageStartOffset; /* Reserve page start offset except u8 FwRsvdPageStartOffset; /* Reserve page start offset except
@ -429,7 +425,6 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter);
void _8051Reset88E(struct adapter *padapter); void _8051Reset88E(struct adapter *padapter);
void rtl8188e_InitializeFirmwareVars(struct adapter *padapter); void rtl8188e_InitializeFirmwareVars(struct adapter *padapter);
s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy); s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);
/* EFuse */ /* EFuse */

1
include/rtl8188e_led.h
View file

@ -23,7 +23,6 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
/* */ /* */
/* Interface to manipulate LED objects. */ /* Interface to manipulate LED objects. */
/* */ /* */

1
include/rtl8188e_rf.h
View file

@ -24,7 +24,6 @@
#define RF6052_MAX_REG 0x3F #define RF6052_MAX_REG 0x3F
#define RF6052_MAX_PATH 2 #define RF6052_MAX_PATH 2
int PHY_RF6052_Config8188E(struct adapter *Adapter); int PHY_RF6052_Config8188E(struct adapter *Adapter);
void rtl8188e_RF_ChangeTxPath(struct adapter *Adapter, u16 DataRate); void rtl8188e_RF_ChangeTxPath(struct adapter *Adapter, u16 DataRate);
void rtl8188e_PHY_RF6052SetBandwidth(struct adapter *Adapter, void rtl8188e_PHY_RF6052SetBandwidth(struct adapter *Adapter,

1
include/rtl8188e_spec.h
View file

@ -67,7 +67,6 @@
#define RXPKT_BUF_SELECT 0xA5 #define RXPKT_BUF_SELECT 0xA5
#define DISABLE_TRXPKT_BUF_ACCESS 0x0 #define DISABLE_TRXPKT_BUF_ACCESS 0x0
/* 0x0000h ~ 0x00FFh System Configuration */ /* 0x0000h ~ 0x00FFh System Configuration */
#define REG_SYS_ISO_CTRL 0x0000 #define REG_SYS_ISO_CTRL 0x0000
#define REG_SYS_FUNC_EN 0x0002 #define REG_SYS_FUNC_EN 0x0002

1
include/rtl8188e_xmit.h
View file

@ -63,7 +63,6 @@
#define FSG BIT(27) #define FSG BIT(27)
#define OWN BIT(31) #define OWN BIT(31)
/* OFFSET 4 */ /* OFFSET 4 */
#define PKT_OFFSET_SZ 0 #define PKT_OFFSET_SZ 0
#define QSEL_SHT 8 #define QSEL_SHT 8

2
include/rtw_debug.h
View file

@ -23,7 +23,6 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#define _drv_always_ 1 #define _drv_always_ 1
#define _drv_emerg_ 2 #define _drv_emerg_ 2
#define _drv_alert_ 3 #define _drv_alert_ 3
@ -34,7 +33,6 @@
#define _drv_info_ 8 #define _drv_info_ 8
#define _drv_debug_ 9 #define _drv_debug_ 9
#define _module_rtl871x_xmit_c_ BIT(0) #define _module_rtl871x_xmit_c_ BIT(0)
#define _module_xmit_osdep_c_ BIT(1) #define _module_xmit_osdep_c_ BIT(1)
#define _module_rtl871x_recv_c_ BIT(2) #define _module_rtl871x_recv_c_ BIT(2)

2
include/rtw_event.h
View file

@ -38,7 +38,6 @@ Used to report that the requested site survey has been done.
bss_cnt indicates the number of bss that has been reported. bss_cnt indicates the number of bss that has been reported.
*/ */
struct surveydone_event { struct surveydone_event {
unsigned int bss_cnt; unsigned int bss_cnt;
@ -48,7 +47,6 @@ struct surveydone_event {
/* /*
Used to report the link result of joinning the given bss Used to report the link result of joinning the given bss
join_res: join_res:
-1: authentication fail -1: authentication fail
-2: association fail -2: association fail

2
include/rtw_ioctl.h
View file

@ -23,7 +23,6 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#ifndef OID_802_11_CAPABILITY #ifndef OID_802_11_CAPABILITY
#define OID_802_11_CAPABILITY 0x0d010122 #define OID_802_11_CAPABILITY 0x0d010122
#endif #endif
@ -32,7 +31,6 @@
#define OID_802_11_PMKID 0x0d010123 #define OID_802_11_PMKID 0x0d010123
#endif #endif
/* For DDK-defined OIDs */ /* For DDK-defined OIDs */
#define OID_NDIS_SEG1 0x00010100 #define OID_NDIS_SEG1 0x00010100
#define OID_NDIS_SEG2 0x00010200 #define OID_NDIS_SEG2 0x00010200

1
include/rtw_ioctl_set.h
View file

@ -22,7 +22,6 @@
#include <drv_types.h> #include <drv_types.h>
typedef u8 NDIS_802_11_PMKID_VALUE[16]; typedef u8 NDIS_802_11_PMKID_VALUE[16];
u8 rtw_set_802_11_add_key(struct adapter *adapt, struct ndis_802_11_key *key); u8 rtw_set_802_11_add_key(struct adapter *adapt, struct ndis_802_11_key *key);

5
include/rtw_mlme.h
View file

@ -595,7 +595,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter);
#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) #define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
#define rtw_set_scan_deny(adapter, ms) do {} while (0) #define rtw_set_scan_deny(adapter, ms) do {} while (0)
int _rtw_init_mlme_priv(struct adapter *padapter); int _rtw_init_mlme_priv(struct adapter *padapter);
void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
@ -608,25 +607,21 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue);
struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv); struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv);
void _rtw_free_network(struct mlme_priv *pmlmepriv, void _rtw_free_network(struct mlme_priv *pmlmepriv,
struct wlan_network *pnetwork, u8 isfreeall); struct wlan_network *pnetwork, u8 isfreeall);
void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
struct wlan_network *pnetwork); struct wlan_network *pnetwork);
struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr); struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr);
void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall); void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall);
int rtw_if_up(struct adapter *padapter); int rtw_if_up(struct adapter *padapter);
u8 *rtw_get_capability_from_ie(u8 *ie); u8 *rtw_get_capability_from_ie(u8 *ie);
u8 *rtw_get_timestampe_from_ie(u8 *ie); u8 *rtw_get_timestampe_from_ie(u8 *ie);
u8 *rtw_get_beacon_interval_from_ie(u8 *ie); u8 *rtw_get_beacon_interval_from_ie(u8 *ie);
void rtw_joinbss_reset(struct adapter *padapter); void rtw_joinbss_reset(struct adapter *padapter);
unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie,

4
include/rtw_mlme_ext.h
View file

@ -24,7 +24,6 @@
#include <drv_types.h> #include <drv_types.h>
#include <wlan_bssdef.h> #include <wlan_bssdef.h>
/* Commented by Albert 20101105 */ /* Commented by Albert 20101105 */
/* Increase the SURVEY_TO value from 100 to 150 ( 100ms to 150ms ) */ /* Increase the SURVEY_TO value from 100 to 150 ( 100ms to 150ms ) */
/* The Realtek 8188CE SoftAP will spend around 100ms to send the probe response after receiving the probe request. */ /* The Realtek 8188CE SoftAP will spend around 100ms to send the probe response after receiving the probe request. */
@ -79,7 +78,6 @@
#define _HW_STATE_STATION_ 0x02 #define _HW_STATE_STATION_ 0x02
#define _HW_STATE_AP_ 0x03 #define _HW_STATE_AP_ 0x03
#define _1M_RATE_ 0 #define _1M_RATE_ 0
#define _2M_RATE_ 1 #define _2M_RATE_ 1
#define _5M_RATE_ 2 #define _5M_RATE_ 2
@ -93,7 +91,6 @@
#define _48M_RATE_ 10 #define _48M_RATE_ 10
#define _54M_RATE_ 11 #define _54M_RATE_ 11
extern unsigned char RTW_WPA_OUI[]; extern unsigned char RTW_WPA_OUI[];
extern unsigned char WMM_OUI[]; extern unsigned char WMM_OUI[];
extern unsigned char WPS_OUI[]; extern unsigned char WPS_OUI[];
@ -842,7 +839,6 @@ enum rtw_c2h_event {
MAX_C2HEVT MAX_C2HEVT
}; };
#ifdef _RTW_MLME_EXT_C_ #ifdef _RTW_MLME_EXT_C_
static struct fwevent wlanevents[] = { static struct fwevent wlanevents[] = {

1
include/rtw_mp.h
View file

@ -99,7 +99,6 @@ enum antenna_path {
ANTENNA_ABCD ANTENNA_ABCD
}; };
#define MAX_MP_XMITBUF_SZ 2048 #define MAX_MP_XMITBUF_SZ 2048
#define NR_MP_XMITFRAME 8 #define NR_MP_XMITFRAME 8

1
include/rtw_mp_ioctl.h
View file

@ -336,5 +336,4 @@ s32 rtl8188eu_mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv);
#define EXT_MP_IOCTL_HANDLER(sz, subcode, oid) \ #define EXT_MP_IOCTL_HANDLER(sz, subcode, oid) \
{sz, rtl8188eu_mp_ioctl_##subcode##_hdl, oid}, {sz, rtl8188eu_mp_ioctl_##subcode##_hdl, oid},
#endif #endif

5
include/rtw_mp_phy_regdef.h
View file

@ -43,7 +43,6 @@
#ifndef __RTW_MP_PHY_REGDEF_H_ #ifndef __RTW_MP_PHY_REGDEF_H_
#define __RTW_MP_PHY_REGDEF_H_ #define __RTW_MP_PHY_REGDEF_H_
/*--------------------------Define Parameters-------------------------------*/ /*--------------------------Define Parameters-------------------------------*/
/* */ /* */
@ -59,7 +58,6 @@
/* 5. Other definition for BB/RF R/W */ /* 5. Other definition for BB/RF R/W */
/* */ /* */
/* */ /* */
/* 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF */ /* 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF */
/* 1. Page1(0x100) */ /* 1. Page1(0x100) */
@ -289,7 +287,6 @@
#define rOFDM_RxEVMCSI 0xdd8 #define rOFDM_RxEVMCSI 0xdd8
#define rOFDM_SIGReport 0xddc #define rOFDM_SIGReport 0xddc
/* */ /* */
/* 8. PageE(0xE00) */ /* 8. PageE(0xE00) */
/* */ /* */
@ -993,7 +990,6 @@
#define bRTL8258_RxLPFBW 0xc00 #define bRTL8258_RxLPFBW 0xc00
#define bRTL8258_RSSILPFBW 0xc0 #define bRTL8258_RSSILPFBW 0xc0
/* */ /* */
/* Other Definition */ /* Other Definition */
/* */ /* */
@ -1080,5 +1076,4 @@
/*--------------------------Define Parameters-------------------------------*/ /*--------------------------Define Parameters-------------------------------*/
#endif /* __INC_HAL8192SPHYREG_H */ #endif /* __INC_HAL8192SPHYREG_H */

4
include/rtw_recv.h
View file

@ -23,7 +23,6 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
#define NR_RECVFRAME 256 #define NR_RECVFRAME 256
#define RXFRAME_ALIGN 8 #define RXFRAME_ALIGN 8
@ -145,7 +144,6 @@ struct rx_pkt_attrib {
struct phy_info phy_info; struct phy_info phy_info;
}; };
/* These definition is used for Rx packet reordering. */ /* These definition is used for Rx packet reordering. */
#define SN_LESS(a, b) (((a - b) & 0x800) != 0) #define SN_LESS(a, b) (((a - b) & 0x800) != 0)
#define SN_EQUAL(a, b) (a == b) #define SN_EQUAL(a, b) (a == b)
@ -264,7 +262,6 @@ struct recv_buf {
tail -----> tail ----->
end -----> end ----->
len = (unsigned int )(tail - data); len = (unsigned int )(tail - data);
@ -475,7 +472,6 @@ static inline s32 translate_percentage_to_dbm(u32 sig_stren_index)
return power; return power;
} }
struct sta_info; struct sta_info;
void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv); void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv);

1
include/rtw_rf.h
View file

@ -142,5 +142,4 @@ enum rt_rf_type_def {
u32 rtw_ch2freq(u32 ch); u32 rtw_ch2freq(u32 ch);
u32 rtw_freq2ch(u32 freq); u32 rtw_freq2ch(u32 freq);
#endif /* _RTL8711_RF_H_ */ #endif /* _RTL8711_RF_H_ */

3
include/rtw_security.h
View file

@ -50,7 +50,6 @@ enum {
ENCRYP_PROTOCOL_MAX ENCRYP_PROTOCOL_MAX
}; };
#ifndef Ndis802_11AuthModeWPA2 #ifndef Ndis802_11AuthModeWPA2
#define Ndis802_11AuthModeWPA2 (Ndis802_11AuthModeWPANone + 1) #define Ndis802_11AuthModeWPA2 (Ndis802_11AuthModeWPANone + 1)
#endif #endif
@ -222,7 +221,6 @@ do { \
} \ } \
} while (0) } while (0)
#define GET_TKIP_PN(iv, dot11txpn) \ #define GET_TKIP_PN(iv, dot11txpn) \
do { \ do { \
dot11txpn._byte_.TSC0 = iv[2]; \ dot11txpn._byte_.TSC0 = iv[2]; \
@ -233,7 +231,6 @@ do { \
dot11txpn._byte_.TSC5 = iv[7]; \ dot11txpn._byte_.TSC5 = iv[7]; \
} while (0) } while (0)
#define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1))) #define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
#define ROR32(A, n) ROL32((A), 32-(n)) #define ROR32(A, n) ROL32((A), 32-(n))

1
include/rtw_xmit.h
View file

@ -59,7 +59,6 @@ do {\
dot11txpn.val = (dot11txpn.val == 0xffffff) ? 0 : (dot11txpn.val+1);\ dot11txpn.val = (dot11txpn.val == 0xffffff) ? 0 : (dot11txpn.val+1);\
} while (0) } while (0)
#define TKIP_IV(pattrib_iv, dot11txpn, keyidx)\ #define TKIP_IV(pattrib_iv, dot11txpn, keyidx)\
do {\ do {\
pattrib_iv[0] = dot11txpn._byte_.TSC1;\ pattrib_iv[0] = dot11txpn._byte_.TSC1;\

2
include/usb_ops.h
View file

@ -30,7 +30,7 @@
#define REALTEK_USB_VENQT_CMD_REQ 0x05 #define REALTEK_USB_VENQT_CMD_REQ 0x05
#define REALTEK_USB_VENQT_CMD_IDX 0x00 #define REALTEK_USB_VENQT_CMD_IDX 0x00
enum{ enum {
VENDOR_WRITE = 0x00, VENDOR_WRITE = 0x00,
VENDOR_READ = 0x01, VENDOR_READ = 0x01,
}; };

1
include/usb_vendor_req.h
View file

@ -33,7 +33,6 @@
#define RT_USB_SYSCLK_40MHZ 1 #define RT_USB_SYSCLK_40MHZ 1
#define RT_USB_SYSCLK_60MHZ 2 #define RT_USB_SYSCLK_60MHZ 2
enum bt_usb_request { enum bt_usb_request {
RT_USB_SET_REGISTER = 1, RT_USB_SET_REGISTER = 1,
RT_USB_SET_SYSCLK = 2, RT_USB_SET_SYSCLK = 2,

11
include/wifi.h
View file

@ -20,14 +20,12 @@
#ifndef _WIFI_H_ #ifndef _WIFI_H_
#define _WIFI_H_ #define _WIFI_H_
#ifdef BIT #ifdef BIT
/* error "BIT define occurred earlier elsewhere!\n" */ /* error "BIT define occurred earlier elsewhere!\n" */
#undef BIT #undef BIT
#endif #endif
#define BIT(x) (1 << (x)) #define BIT(x) (1 << (x))
#define WLAN_ETHHDR_LEN 14 #define WLAN_ETHHDR_LEN 14
#define WLAN_ETHADDR_LEN 6 #define WLAN_ETHADDR_LEN 6
#define WLAN_IEEE_OUI_LEN 3 #define WLAN_IEEE_OUI_LEN 3
@ -262,7 +260,6 @@ enum WIFI_REG_DOMAIN {
#define get_tofr_ds(pframe) ((GetToDs(pframe) << 1) | GetFrDs(pframe)) #define get_tofr_ds(pframe) ((GetToDs(pframe) << 1) | GetFrDs(pframe))
#define SetMFrag(pbuf) \ #define SetMFrag(pbuf) \
*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_) *(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_)
@ -304,7 +301,6 @@ enum WIFI_REG_DOMAIN {
#define ClearPrivacy(pbuf) \ #define ClearPrivacy(pbuf) \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_PRIVACY_)) *(__le16 *)(pbuf) &= (~cpu_to_le16(_PRIVACY_))
#define GetOrder(pbuf) \ #define GetOrder(pbuf) \
(((*(__le16 *)(pbuf)) & cpu_to_le16(_ORDER_)) != 0) (((*(__le16 *)(pbuf)) & cpu_to_le16(_ORDER_)) != 0)
@ -354,7 +350,6 @@ enum WIFI_REG_DOMAIN {
#define SetDuration(pbuf, dur) \ #define SetDuration(pbuf, dur) \
*(__le16 *)((size_t)(pbuf) + 2) = cpu_to_le16(0xffff & (dur)) *(__le16 *)((size_t)(pbuf) + 2) = cpu_to_le16(0xffff & (dur))
#define SetPriority(pbuf, tid) \ #define SetPriority(pbuf, tid) \
*(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf) *(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf)
@ -529,7 +524,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
#define _HT_ADD_INFO_IE_ 61 /* _HT_EXTRA_INFO_IE_ */ #define _HT_ADD_INFO_IE_ 61 /* _HT_EXTRA_INFO_IE_ */
#define _WAPI_IE_ 68 #define _WAPI_IE_ 68
#define EID_BSSCoexistence 72 /* 20/40 BSS Coexistence */ #define EID_BSSCoexistence 72 /* 20/40 BSS Coexistence */
#define EID_BSSIntolerantChlReport 73 #define EID_BSSIntolerantChlReport 73
#define _RIC_Descriptor_IE_ 75 #define _RIC_Descriptor_IE_ 75
@ -597,7 +591,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
#define _WMM_IE_Length_ 7 /* for WMM STA */ #define _WMM_IE_Length_ 7 /* for WMM STA */
#define _WMM_Para_Element_Length_ 24 #define _WMM_Para_Element_Length_ 24
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
Below is the definition for 802.11n Below is the definition for 802.11n
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -610,7 +603,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
#define GetOrderBit(pbuf) \ #define GetOrderBit(pbuf) \
(((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0)
/** /**
* struct rtw_ieee80211_bar - HT Block Ack Request * struct rtw_ieee80211_bar - HT Block Ack Request
* *
@ -753,14 +745,12 @@ enum ht_cap_ampdu_factor {
#define IEEE80211_MIN_AMPDU_BUF 0x8 #define IEEE80211_MIN_AMPDU_BUF 0x8
#define IEEE80211_MAX_AMPDU_BUF 0x40 #define IEEE80211_MAX_AMPDU_BUF 0x40
/* Spatial Multiplexing Power Save Modes */ /* Spatial Multiplexing Power Save Modes */
#define WLAN_HT_CAP_SM_PS_STATIC 0 #define WLAN_HT_CAP_SM_PS_STATIC 0
#define WLAN_HT_CAP_SM_PS_DYNAMIC 1 #define WLAN_HT_CAP_SM_PS_DYNAMIC 1
#define WLAN_HT_CAP_SM_PS_INVALID 2 #define WLAN_HT_CAP_SM_PS_INVALID 2
#define WLAN_HT_CAP_SM_PS_DISABLED 3 #define WLAN_HT_CAP_SM_PS_DISABLED 3
#define OP_MODE_PURE 0 #define OP_MODE_PURE 0
#define OP_MODE_MAY_BE_LEGACY_STAS 1 #define OP_MODE_MAY_BE_LEGACY_STAS 1
#define OP_MODE_20MHZ_HT_STA_ASSOCED 2 #define OP_MODE_20MHZ_HT_STA_ASSOCED 2
@ -963,7 +953,6 @@ enum ht_cap_ampdu_factor {
#define P2P_PRESENCE_RESPONSE 2 #define P2P_PRESENCE_RESPONSE 2
#define P2P_GO_DISC_REQUEST 3 #define P2P_GO_DISC_REQUEST 3
#define P2P_MAX_PERSISTENT_GROUP_NUM 10 #define P2P_MAX_PERSISTENT_GROUP_NUM 10
#define P2P_PROVISIONING_SCAN_CNT 3 #define P2P_PROVISIONING_SCAN_CNT 3

4
include/wlan_bssdef.h
View file

@ -20,7 +20,6 @@
#ifndef __WLAN_BSSDEF_H__ #ifndef __WLAN_BSSDEF_H__
#define __WLAN_BSSDEF_H__ #define __WLAN_BSSDEF_H__
#define MAX_IE_SZ 768 #define MAX_IE_SZ 768
#define NDIS_802_11_LENGTH_SSID 32 #define NDIS_802_11_LENGTH_SSID 32
@ -75,8 +74,6 @@ struct ndis_802_11_fixed_ie {
u16 Capabilities; u16 Capabilities;
}; };
struct ndis_802_11_var_ie { struct ndis_802_11_var_ie {
u8 ElementID; u8 ElementID;
u8 Length; u8 Length;
@ -222,7 +219,6 @@ struct ndis_802_11_test {
} tt; } tt;
}; };
#ifndef Ndis802_11APMode #ifndef Ndis802_11APMode
#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1) #define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)
#endif #endif

10
os_dep/ioctl_linux.c
View file

@ -472,8 +472,6 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
param->u.crypt.err = 0; param->u.crypt.err = 0;
param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
@ -615,8 +613,6 @@ exit:
kfree(pwep); kfree(pwep);
return ret; return ret;
} }
@ -1252,7 +1248,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_set_scan\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_set_scan\n"));
if (padapter->registrypriv.mp_mode == 1) { if (padapter->registrypriv.mp_mode == 1) {
if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) { if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
ret = -1; ret = -1;
@ -1383,7 +1378,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
exit: exit:
return ret; return ret;
} }
@ -1634,8 +1628,6 @@ static int rtw_wx_set_rate(struct net_device *dev,
u32 ratevalue = 0; u32 ratevalue = 0;
u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff}; u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_set_rate\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_set_rate\n"));
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("target_rate = %d, fixed = %d\n", target_rate, fixed)); RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("target_rate = %d, fixed = %d\n", target_rate, fixed));
@ -1706,8 +1698,6 @@ set_rate:
ret = -1; ret = -1;
} }
return ret; return ret;
} }

4
os_dep/mlme_linux.c
View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#define _MLME_OSDEP_C_ #define _MLME_OSDEP_C_
#include <osdep_service.h> #include <osdep_service.h>
@ -32,7 +31,6 @@ void rtw_join_timeout_handler (void *FunctionContext)
_rtw_join_timeout_handler(adapter); _rtw_join_timeout_handler(adapter);
} }
void _rtw_scan_timeout_handler (void *FunctionContext) void _rtw_scan_timeout_handler (void *FunctionContext)
{ {
struct adapter *adapter = (struct adapter *)FunctionContext; struct adapter *adapter = (struct adapter *)FunctionContext;
@ -206,7 +204,6 @@ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *pst
if (pstapriv->sta_aid[psta->aid - 1] != psta) if (pstapriv->sta_aid[psta->aid - 1] != psta)
return; return;
wrqu.addr.sa_family = ARPHRD_ETHER; wrqu.addr.sa_family = ARPHRD_ETHER;
memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
@ -230,7 +227,6 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *
if (pstapriv->sta_aid[psta->aid - 1] != psta) if (pstapriv->sta_aid[psta->aid - 1] != psta)
return; return;
wrqu.addr.sa_family = ARPHRD_ETHER; wrqu.addr.sa_family = ARPHRD_ETHER;
memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);

7
os_dep/os_intfs.c
View file

@ -245,7 +245,6 @@ void rtw_proc_init_one(struct net_device *dev)
} }
entry->write_proc = proc_set_read_reg; entry->write_proc = proc_set_read_reg;
entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO, entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO,
dir_dev, proc_get_fwstate, dev); dir_dev, proc_get_fwstate, dev);
if (!entry) { if (!entry) {
@ -522,8 +521,6 @@ static uint loadparam(struct adapter *padapter, struct net_device *pnetdev)
uint status = _SUCCESS; uint status = _SUCCESS;
struct registry_priv *registry_par = &padapter->registrypriv; struct registry_priv *registry_par = &padapter->registrypriv;
GlobalDebugLevel = rtw_debug; GlobalDebugLevel = rtw_debug;
registry_par->chip_version = (u8)rtw_chip_version; registry_par->chip_version = (u8)rtw_chip_version;
registry_par->rfintfs = (u8)rtw_rfintfs; registry_par->rfintfs = (u8)rtw_rfintfs;
@ -868,8 +865,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
u8 ret8 = _SUCCESS; u8 ret8 = _SUCCESS;
unsigned long flags; unsigned long flags;
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw\n"));
if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) { if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) {
@ -991,7 +986,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
} }
#endif #endif
_rtw_spinlock_free(&padapter->br_ext_lock); _rtw_spinlock_free(&padapter->br_ext_lock);
free_mlme_ext_priv(&padapter->mlmeextpriv); free_mlme_ext_priv(&padapter->mlmeextpriv);
@ -1171,7 +1165,6 @@ netdev_open_error:
return _FAIL; return _FAIL;
} }
int rtw_ips_pwr_up(struct adapter *padapter) int rtw_ips_pwr_up(struct adapter *padapter)
{ {
int result; int result;

2
os_dep/osdep_service.c
View file

@ -18,7 +18,6 @@
* *
******************************************************************************/ ******************************************************************************/
#define _OSDEP_SERVICE_C_ #define _OSDEP_SERVICE_C_
#include <osdep_service.h> #include <osdep_service.h>
@ -521,7 +520,6 @@ keep_ori:
kfree(ori); kfree(ori);
} }
/** /**
* rtw_cbuf_full - test if cbuf is full * rtw_cbuf_full - test if cbuf is full
* @cbuf: pointer of struct rtw_cbuf * @cbuf: pointer of struct rtw_cbuf

5
os_dep/recv_linux.c
View file

@ -130,8 +130,6 @@ int rtw_recv_indicatepkt(struct adapter *padapter,
struct sk_buff *skb; struct sk_buff *skb;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
precvpriv = &(padapter->recvpriv); precvpriv = &(padapter->recvpriv);
pfree_recv_queue = &(precvpriv->free_recv_queue); pfree_recv_queue = &(precvpriv->free_recv_queue);
@ -220,8 +218,6 @@ _recv_indicatepkt_end:
RT_TRACE(_module_recv_osdep_c_, _drv_info_, RT_TRACE(_module_recv_osdep_c_, _drv_info_,
("\n rtw_recv_indicatepkt :after netif_rx!!!!\n")); ("\n rtw_recv_indicatepkt :after netif_rx!!!!\n"));
return _SUCCESS; return _SUCCESS;
_recv_indicatepkt_drop: _recv_indicatepkt_drop:
@ -229,7 +225,6 @@ _recv_indicatepkt_drop:
/* enqueue back to free_recv_queue */ /* enqueue back to free_recv_queue */
rtw_free_recvframe(precv_frame, pfree_recv_queue); rtw_free_recvframe(precv_frame, pfree_recv_queue);
return _FAIL; return _FAIL;
} }

4
os_dep/usb_intf.c
View file

@ -39,11 +39,9 @@ int ui_pid[3] = {0, 0, 0};
static int rtw_suspend(struct usb_interface *intf, pm_message_t message); static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
static int rtw_resume(struct usb_interface *intf); static int rtw_resume(struct usb_interface *intf);
static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid); static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid);
static void rtw_dev_remove(struct usb_interface *pusb_intf); static void rtw_dev_remove(struct usb_interface *pusb_intf);
#define USB_VENDER_ID_REALTEK 0x0bda #define USB_VENDER_ID_REALTEK 0x0bda
/* DID_USB_v916_20130116 */ /* DID_USB_v916_20130116 */
@ -164,7 +162,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
struct usb_endpoint_descriptor *pendp_desc; struct usb_endpoint_descriptor *pendp_desc;
struct usb_device *pusbd; struct usb_device *pusbd;
pdvobjpriv = (struct dvobj_priv *)rtw_zmalloc(sizeof(*pdvobjpriv)); pdvobjpriv = (struct dvobj_priv *)rtw_zmalloc(sizeof(*pdvobjpriv));
if (pdvobjpriv == NULL) if (pdvobjpriv == NULL)
goto exit; goto exit;
@ -243,7 +240,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf); struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf);
usb_set_intfdata(usb_intf, NULL); usb_set_intfdata(usb_intf, NULL);
if (dvobj) { if (dvobj) {
/* Modify condition for 92DU DMDP 2010.11.18, by Thomas */ /* Modify condition for 92DU DMDP 2010.11.18, by Thomas */

5
os_dep/usb_ops_linux.c
View file

@ -80,8 +80,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct hal_data_8188e *haldata; struct hal_data_8188e *haldata;
switch (pxmitbuf->flags) { switch (pxmitbuf->flags) {
case VO_QUEUE_INX: case VO_QUEUE_INX:
pxmitpriv->voq_cnt--; pxmitpriv->voq_cnt--;
@ -157,7 +155,6 @@ check_completion:
tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
} }
u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
@ -174,8 +171,6 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data;
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port\n")); RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port\n"));
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) || if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||

14
os_dep/xmit_linux.c
View file

@ -40,7 +40,6 @@ uint rtw_remainder_len(struct pkt_file *pfile)
void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile) void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile)
{ {
pfile->pkt = pktptr; pfile->pkt = pktptr;
pfile->cur_addr = pktptr->data; pfile->cur_addr = pktptr->data;
pfile->buf_start = pktptr->data; pfile->buf_start = pktptr->data;
@ -49,15 +48,12 @@ void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile)
pfile->cur_buffer = pfile->buf_start; pfile->cur_buffer = pfile->buf_start;
} }
uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen) uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen)
{ {
uint len = 0; uint len = 0;
len = rtw_remainder_len(pfile); len = rtw_remainder_len(pfile);
len = (rlen > len) ? len : rlen; len = (rlen > len) ? len : rlen;
@ -67,22 +63,17 @@ uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen)
pfile->cur_addr += len; pfile->cur_addr += len;
pfile->pkt_len -= len; pfile->pkt_len -= len;
return len; return len;
} }
int rtw_endofpktfile(struct pkt_file *pfile) int rtw_endofpktfile(struct pkt_file *pfile)
{ {
if (pfile->pkt_len == 0) { if (pfile->pkt_len == 0) {
return true; return true;
} }
return false; return false;
} }
@ -238,7 +229,6 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
return true; return true;
} }
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
@ -246,8 +236,6 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
s32 res = 0; s32 res = 0;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n"));
if (rtw_if_up(padapter) == false) { if (rtw_if_up(padapter) == false) {
@ -282,7 +270,5 @@ drop_packet:
exit: exit:
return 0; return 0;
} }