rtl8188eu: Remove wrapper around INIT_LIST_HEAD()

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-12 23:13:40 -06:00
parent 609fff0d67
commit 9ad78a5b0d
14 changed files with 38 additions and 44 deletions

View file

@ -1170,7 +1170,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
paclnode = &pacl_list->aclnode[i]; paclnode = &pacl_list->aclnode[i];
if (!paclnode->valid) { if (!paclnode->valid) {
_rtw_init_listhead(&paclnode->list); INIT_LIST_HEAD(&paclnode->list);
memcpy(paclnode->addr, addr, ETH_ALEN); memcpy(paclnode->addr, addr, ETH_ALEN);
@ -1910,11 +1910,11 @@ void start_ap_mode(struct adapter *padapter)
pmlmepriv->p2p_probe_resp_ie = NULL; pmlmepriv->p2p_probe_resp_ie = NULL;
/* for ACL */ /* for ACL */
_rtw_init_listhead(&(pacl_list->acl_node_q.queue)); INIT_LIST_HEAD(&(pacl_list->acl_node_q.queue));
pacl_list->num = 0; pacl_list->num = 0;
pacl_list->mode = 0; pacl_list->mode = 0;
for (i = 0; i < NUM_ACL; i++) { for (i = 0; i < NUM_ACL; i++) {
_rtw_init_listhead(&pacl_list->aclnode[i].list); INIT_LIST_HEAD(&pacl_list->aclnode[i].list);
pacl_list->aclnode[i].valid = false; pacl_list->aclnode[i].valid = false;
} }
} }

View file

@ -657,7 +657,7 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
return _FAIL; return _FAIL;
} }
_rtw_init_listhead(&ph2c->list); INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetBBReg); ph2c->cmdcode = GEN_CMD_CODE(_GetBBReg);
ph2c->parmbuf = (unsigned char *)prdbbparm; ph2c->parmbuf = (unsigned char *)prdbbparm;
ph2c->cmdsz = sizeof(struct readBB_parm); ph2c->cmdsz = sizeof(struct readBB_parm);
@ -723,7 +723,7 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
goto exit; goto exit;
} }
_rtw_init_listhead(&ph2c->list); INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg); ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg);
ph2c->parmbuf = (unsigned char *)prdrfparm; ph2c->parmbuf = (unsigned char *)prdrfparm;
ph2c->cmdsz = sizeof(struct readRF_parm); ph2c->cmdsz = sizeof(struct readRF_parm);
@ -784,7 +784,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
goto exit; goto exit;
} }
_rtw_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _CreateBss_CMD_; pcmd->cmdcode = _CreateBss_CMD_;
pcmd->parmbuf = (unsigned char *)pdev_network; pcmd->parmbuf = (unsigned char *)pdev_network;
pcmd->cmdsz = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pdev_network); pcmd->cmdsz = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pdev_network);
@ -809,7 +809,7 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned
goto exit; goto exit;
} }
_rtw_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = GEN_CMD_CODE(_CreateBss); pcmd->cmdcode = GEN_CMD_CODE(_CreateBss);
pcmd->parmbuf = pbss; pcmd->parmbuf = pbss;
pcmd->cmdsz = sz; pcmd->cmdsz = sz;
@ -947,7 +947,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */ pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */
_rtw_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */ pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */
pcmd->parmbuf = (unsigned char *)psecnetwork; pcmd->parmbuf = (unsigned char *)psecnetwork;
pcmd->rsp = NULL; pcmd->rsp = NULL;
@ -1191,7 +1191,7 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
/* init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); */ /* init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); */
_rtw_init_listhead(&ph2c->list); INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetRaTable); ph2c->cmdcode = GEN_CMD_CODE(_GetRaTable);
ph2c->parmbuf = (unsigned char *)pgetrttblparm; ph2c->parmbuf = (unsigned char *)pgetrttblparm;
ph2c->cmdsz = sizeof(struct getratable_parm); ph2c->cmdsz = sizeof(struct getratable_parm);

View file

@ -83,7 +83,7 @@ int _rtw_init_mlme_priv (struct adapter *padapter)
pnetwork = (struct wlan_network *)pbuf; pnetwork = (struct wlan_network *)pbuf;
for (i = 0; i < MAX_BSS_CNT; i++) { for (i = 0; i < MAX_BSS_CNT; i++) {
_rtw_init_listhead(&(pnetwork->list)); INIT_LIST_HEAD(&(pnetwork->list));
rtw_list_insert_tail(&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); rtw_list_insert_tail(&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue));
@ -1790,7 +1790,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
pcmd->cmdsz = (sizeof(struct setauth_parm)); pcmd->cmdsz = (sizeof(struct setauth_parm));
pcmd->rsp = NULL; pcmd->rsp = NULL;
pcmd->rspsz = 0; pcmd->rspsz = 0;
_rtw_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
("after enqueue set_auth_cmd, auth_mode=%x\n", ("after enqueue set_auth_cmd, auth_mode=%x\n",
psecuritypriv->dot11AuthAlgrthm)); psecuritypriv->dot11AuthAlgrthm));
@ -1874,7 +1874,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in
pcmd->cmdsz = (sizeof(struct setkey_parm)); pcmd->cmdsz = (sizeof(struct setkey_parm));
pcmd->rsp = NULL; pcmd->rsp = NULL;
pcmd->rspsz = 0; pcmd->rspsz = 0;
_rtw_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
res = rtw_enqueue_cmd(pcmdpriv, pcmd); res = rtw_enqueue_cmd(pcmdpriv, pcmd);
exit: exit:

View file

@ -7015,7 +7015,7 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame
return; return;
} }
_rtw_init_listhead(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
@ -7067,7 +7067,7 @@ void report_surveydone_event(struct adapter *padapter)
return; return;
} }
_rtw_init_listhead(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
@ -7113,7 +7113,7 @@ void report_join_res(struct adapter *padapter, int res)
return; return;
} }
_rtw_init_listhead(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
@ -7164,7 +7164,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
return; return;
} }
_rtw_init_listhead(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
@ -7218,7 +7218,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
return; return;
} }
_rtw_init_listhead(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;

View file

@ -966,7 +966,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv)
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf; pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;
for (i = 0; i < num_xmit_extbuf; i++) { for (i = 0; i < num_xmit_extbuf; i++) {
_rtw_init_listhead(&pxmitbuf->list); INIT_LIST_HEAD(&pxmitbuf->list);
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter; pxmitbuf->padapter = padapter;

View file

@ -86,7 +86,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
precvframe = (union recv_frame *)precvpriv->precv_frame_buf; precvframe = (union recv_frame *)precvpriv->precv_frame_buf;
for (i = 0; i < NR_RECVFRAME; i++) { for (i = 0; i < NR_RECVFRAME; i++) {
_rtw_init_listhead(&(precvframe->u.list)); INIT_LIST_HEAD(&(precvframe->u.list));
rtw_list_insert_tail(&(precvframe->u.list), &(precvpriv->free_recv_queue.queue)); rtw_list_insert_tail(&(precvframe->u.list), &(precvpriv->free_recv_queue.queue));
@ -184,7 +184,7 @@ union recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpriv) void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpriv)
{ {
/* Perry: This can be removed */ /* Perry: This can be removed */
_rtw_init_listhead(&precvframe->u.hdr.list); INIT_LIST_HEAD(&precvframe->u.hdr.list);
precvframe->u.hdr.len = 0; precvframe->u.hdr.len = 0;
} }

View file

@ -32,8 +32,8 @@ static void _rtw_init_stainfo(struct sta_info *psta)
memset((u8 *)psta, 0, sizeof (struct sta_info)); memset((u8 *)psta, 0, sizeof (struct sta_info));
spin_lock_init(&psta->lock); spin_lock_init(&psta->lock);
_rtw_init_listhead(&psta->list); INIT_LIST_HEAD(&psta->list);
_rtw_init_listhead(&psta->hash_list); INIT_LIST_HEAD(&psta->hash_list);
_rtw_init_queue(&psta->sleep_q); _rtw_init_queue(&psta->sleep_q);
psta->sleepq_len = 0; psta->sleepq_len = 0;
@ -42,9 +42,9 @@ static void _rtw_init_stainfo(struct sta_info *psta)
#ifdef CONFIG_88EU_AP_MODE #ifdef CONFIG_88EU_AP_MODE
_rtw_init_listhead(&psta->asoc_list); INIT_LIST_HEAD(&psta->asoc_list);
_rtw_init_listhead(&psta->auth_list); INIT_LIST_HEAD(&psta->auth_list);
psta->expire_to = 0; psta->expire_to = 0;
@ -97,7 +97,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
for (i = 0; i < NUM_STA; i++) { for (i = 0; i < NUM_STA; i++) {
_rtw_init_stainfo(psta); _rtw_init_stainfo(psta);
_rtw_init_listhead(&(pstapriv->sta_hash[i])); INIT_LIST_HEAD(&(pstapriv->sta_hash[i]));
rtw_list_insert_tail(&psta->list, get_list_head(&pstapriv->free_sta_queue)); rtw_list_insert_tail(&psta->list, get_list_head(&pstapriv->free_sta_queue));
@ -109,8 +109,8 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
pstapriv->sta_dz_bitmap = 0; pstapriv->sta_dz_bitmap = 0;
pstapriv->tim_bitmap = 0; pstapriv->tim_bitmap = 0;
_rtw_init_listhead(&pstapriv->asoc_list); INIT_LIST_HEAD(&pstapriv->asoc_list);
_rtw_init_listhead(&pstapriv->auth_list); INIT_LIST_HEAD(&pstapriv->auth_list);
spin_lock_init(&pstapriv->asoc_list_lock); spin_lock_init(&pstapriv->asoc_list_lock);
spin_lock_init(&pstapriv->auth_list_lock); spin_lock_init(&pstapriv->auth_list_lock);
pstapriv->asoc_list_cnt = 0; pstapriv->asoc_list_cnt = 0;

View file

@ -33,7 +33,7 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
static void _init_txservq(struct tx_servq *ptxservq) static void _init_txservq(struct tx_servq *ptxservq)
{ {
_rtw_init_listhead(&ptxservq->tx_pending); INIT_LIST_HEAD(&ptxservq->tx_pending);
_rtw_init_queue(&ptxservq->sta_pending); _rtw_init_queue(&ptxservq->sta_pending);
ptxservq->qcnt = 0; ptxservq->qcnt = 0;
@ -48,8 +48,8 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
_init_txservq(&psta_xmitpriv->bk_q); _init_txservq(&psta_xmitpriv->bk_q);
_init_txservq(&psta_xmitpriv->vi_q); _init_txservq(&psta_xmitpriv->vi_q);
_init_txservq(&psta_xmitpriv->vo_q); _init_txservq(&psta_xmitpriv->vo_q);
_rtw_init_listhead(&psta_xmitpriv->legacy_dz); INIT_LIST_HEAD(&psta_xmitpriv->legacy_dz);
_rtw_init_listhead(&psta_xmitpriv->apsd); INIT_LIST_HEAD(&psta_xmitpriv->apsd);
} }
@ -103,7 +103,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf; pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;
for (i = 0; i < NR_XMITFRAME; i++) { for (i = 0; i < NR_XMITFRAME; i++) {
_rtw_init_listhead(&(pxframe->list)); INIT_LIST_HEAD(&(pxframe->list));
pxframe->padapter = padapter; pxframe->padapter = padapter;
pxframe->frame_tag = NULL_FRAMETAG; pxframe->frame_tag = NULL_FRAMETAG;
@ -141,7 +141,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
for (i = 0; i < NR_XMITBUFF; i++) { for (i = 0; i < NR_XMITBUFF; i++) {
_rtw_init_listhead(&pxmitbuf->list); INIT_LIST_HEAD(&pxmitbuf->list);
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter; pxmitbuf->padapter = padapter;
@ -181,7 +181,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf; pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;
for (i = 0; i < num_xmit_extbuf; i++) { for (i = 0; i < num_xmit_extbuf; i++) {
_rtw_init_listhead(&pxmitbuf->list); INIT_LIST_HEAD(&pxmitbuf->list);
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter; pxmitbuf->padapter = padapter;

View file

@ -73,7 +73,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
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++) {
_rtw_init_listhead(&precvbuf->list); INIT_LIST_HEAD(&precvbuf->list);
spin_lock_init(&precvbuf->recvbuf_lock); spin_lock_init(&precvbuf->recvbuf_lock);
precvbuf->alloc_sz = MAX_RECVBUF_SZ; precvbuf->alloc_sz = MAX_RECVBUF_SZ;
res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf); res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf);

View file

@ -340,7 +340,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
_rtw_init_listhead(&precvframe->u.hdr.list); INIT_LIST_HEAD(&precvframe->u.hdr.list);
precvframe->u.hdr.precvbuf = NULL; /* can't access the precvbuf for new arch. */ precvframe->u.hdr.precvbuf = NULL; /* can't access the precvbuf for new arch. */
precvframe->u.hdr.len = 0; precvframe->u.hdr.len = 0;

View file

@ -260,7 +260,6 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size);
int _rtw_memcmp(void *dst, void *src, u32 sz); int _rtw_memcmp(void *dst, void *src, u32 sz);
void _rtw_init_listhead(struct list_head *list);
u32 rtw_is_list_empty(struct list_head *phead); u32 rtw_is_list_empty(struct list_head *phead);
void rtw_list_insert_head(struct list_head *plist, struct list_head *phead); void rtw_list_insert_head(struct list_head *plist, struct list_head *phead);
void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead); void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead);

View file

@ -77,7 +77,7 @@ struct evt_priv {
#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \ #define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \
do {\ do {\
_rtw_init_listhead(&pcmd->list);\ INIT_LIST_HEAD(&pcmd->list);\
pcmd->cmdcode = code;\ pcmd->cmdcode = code;\
pcmd->parmbuf = (u8 *)(pparm);\ pcmd->parmbuf = (u8 *)(pparm);\
pcmd->cmdsz = sizeof(*pparm);\ pcmd->cmdsz = sizeof(*pparm);\

View file

@ -4875,7 +4875,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
pcmd->rsp = NULL; pcmd->rsp = NULL;
pcmd->rspsz = 0; pcmd->rspsz = 0;
_rtw_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
res = rtw_enqueue_cmd(pcmdpriv, pcmd); res = rtw_enqueue_cmd(pcmdpriv, pcmd);

View file

@ -123,11 +123,6 @@ int _rtw_memcmp(void *dst, void *src, u32 sz)
return false; return false;
} }
void _rtw_init_listhead(struct list_head *list)
{
INIT_LIST_HEAD(list);
}
/* /*
For the following list_xxx operations, For the following list_xxx operations,
caller must guarantee the atomic context. caller must guarantee the atomic context.
@ -188,7 +183,7 @@ void _rtw_spinlock_free(spinlock_t *plock)
void _rtw_init_queue(struct __queue *pqueue) void _rtw_init_queue(struct __queue *pqueue)
{ {
_rtw_init_listhead(&(pqueue->queue)); INIT_LIST_HEAD(&(pqueue->queue));
spin_lock_init(&(pqueue->lock)); spin_lock_init(&(pqueue->lock));
} }