rtl8192eu: Replace typedefs for struct adapter

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-17 17:13:53 -06:00
parent a8b7b4d54c
commit 202d20077c
140 changed files with 3132 additions and 7948 deletions

View file

@ -69,7 +69,7 @@ _func_exit_;
}
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter)
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
{
int i;
struct xmit_buf *pxmitbuf;
@ -366,7 +366,7 @@ void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
{
int i;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
@ -448,7 +448,7 @@ _func_exit_;
}
static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe)
static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
u32 sz;
struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -674,7 +674,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
pattrib->subtype = WIFI_QOS_DATA_TYPE;
}
static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)
static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)
{
uint i;
struct pkt_file pktfile;
@ -959,7 +959,7 @@ _func_exit_;
return res;
}
static s32 xmitframe_addmic(_adapter *padapter, struct xmit_frame *pxmitframe){
static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe){
sint curfragnum,length;
u8 *pframe, *payload,mic[8];
struct mic_data micdata;
@ -1107,7 +1107,7 @@ _func_exit_;
return _SUCCESS;
}
static s32 xmitframe_swencrypt(_adapter *padapter, struct xmit_frame *pxmitframe){
static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmitframe){
struct pkt_attrib *pattrib = &pxmitframe->attrib;
//struct security_priv *psecuritypriv=&padapter->securitypriv;
@ -1147,7 +1147,7 @@ _func_exit_;
return _SUCCESS;
}
s32 rtw_make_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
{
u16 *qc;
@ -1373,7 +1373,7 @@ _func_exit_;
return res;
}
s32 rtw_txframes_pending(_adapter *padapter)
s32 rtw_txframes_pending(struct adapter *padapter)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1383,7 +1383,7 @@ s32 rtw_txframes_pending(_adapter *padapter)
(_rtw_queue_empty(&pxmitpriv->vo_pending) == _FALSE));
}
s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib)
s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib)
{
struct sta_info *psta;
struct tx_servq *ptxservq;
@ -1438,7 +1438,7 @@ s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib)
#ifdef CONFIG_TDLS
int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action)
int rtw_build_tdls_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action)
{
int res=_SUCCESS;
@ -1483,7 +1483,7 @@ int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *
return res;
}
s32 rtw_make_tdls_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action)
s32 rtw_make_tdls_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action)
{
u16 *qc;
struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr;
@ -1590,7 +1590,7 @@ _func_exit_;
return res;
}
s32 rtw_xmit_tdls_coalesce(_adapter * padapter, struct xmit_frame * pxmitframe, u8 action)
s32 rtw_xmit_tdls_coalesce(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 action)
{
s32 llc_sz;
@ -1728,7 +1728,7 @@ This sub-routine will perform all the following:
6. apply sw-encrypt, if necessary.
*/
s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
{
struct pkt_file pktfile;
@ -1940,7 +1940,7 @@ _func_exit_;
#ifdef CONFIG_IEEE80211W
//broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption
s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
{
struct pkt_file pktfile;
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
@ -2211,7 +2211,7 @@ _func_exit_;
return SNAP_SIZE + sizeof(u16);
}
void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len)
void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
{
uint protection;
@ -2260,7 +2260,7 @@ _func_exit_;
}
void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz)
void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz)
{
struct sta_info *psta = NULL;
struct stainfo_stats *pstats = NULL;
@ -2542,7 +2542,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)//(_queue *pf
struct xmit_frame *pxframe = NULL;
_list *plist, *phead;
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
_func_enter_;
@ -2638,7 +2638,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
{
_irqL irqL;
_queue *queue;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
_pkt *pndis_pkt = NULL;
_func_enter_;
@ -2721,7 +2721,7 @@ _func_enter_;
_func_exit_;
}
s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
if (rtw_xmit_classifier(padapter, pxmitframe) == _FAIL)
{
@ -2785,7 +2785,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct tx_servq *ptxservq = NULL;
_queue *pframe_queue = NULL;
struct xmit_frame *pxmitframe = NULL;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
struct registry_priv *pregpriv = &padapter->registrypriv;
int i, inx[4];
#ifdef CONFIG_USB_HCI
@ -2864,7 +2864,7 @@ _func_exit_;
return pxmitframe;
}
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac)
struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac)
{
struct tx_servq *ptxservq=NULL;
@ -2912,7 +2912,7 @@ _func_exit_;
* Will enqueue pxmitframe to the proper queue,
* and indicate it to xx_pending list.....
*/
s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe)
s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
//_irqL irqL0;
u8 ac_index;
@ -2970,7 +2970,7 @@ _func_exit_;
return res;
}
void rtw_alloc_hwxmits(_adapter *padapter)
void rtw_alloc_hwxmits(struct adapter *padapter)
{
struct hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -3032,7 +3032,7 @@ void rtw_alloc_hwxmits(_adapter *padapter)
}
void rtw_free_hwxmits(_adapter *padapter)
void rtw_free_hwxmits(struct adapter *padapter)
{
struct hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -3057,14 +3057,14 @@ _func_exit_;
}
#ifdef CONFIG_BR_EXT
int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL;
//if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE)
{
void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb);
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
int res, is_vlan_tag=0, i, do_nat25=1;
unsigned short vlan_hdr=0;
void *br_port = NULL;
@ -3109,7 +3109,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP)) {
if (memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN)) {
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, unsigned char *ipAddr);
void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, unsigned char *ipAddr);
if ((padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter,
skb->data+MACADDRLEN, skb->data+WLAN_ETHHDR_LEN+12)) != NULL) {
@ -3134,7 +3134,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
#endif // 1
if (do_nat25)
{
int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method);
int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method);
if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) {
struct sk_buff *newskb;
@ -3279,7 +3279,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe)
}
static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib)
{
u8 qsel;
@ -3302,7 +3302,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
* 0 success, hardware will handle this xmit frame(packet)
* <0 fail
*/
s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
{
static u32 start = 0;
static u32 drop_cnt = 0;
@ -3401,7 +3401,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
}
#ifdef CONFIG_TDLS
sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe)
sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
sint ret=_FALSE;
@ -3477,7 +3477,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_fra
#if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS)
sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe)
sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
_irqL irqL;
sint ret=_FALSE;
@ -3644,7 +3644,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
}
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, _queue *pframequeue)
static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, _queue *pframequeue)
{
sint ret;
_list *plist, *phead;
@ -3683,7 +3683,7 @@ static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_
}
void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)
{
_irqL irqL0;
struct sta_info *psta_bmc;
@ -3746,7 +3746,7 @@ void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
}
void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
{
_irqL irqL;
u8 update_mask=0, wmmps_ac=0;
@ -3925,7 +3925,7 @@ _exit:
}
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
{
_irqL irqL;
u8 wmmps_ac=0;
@ -4032,7 +4032,7 @@ void enqueue_pending_xmitbuf(
{
_irqL irql;
_queue *pqueue;
_adapter *pri_adapter = pxmitpriv->adapter;
struct adapter *pri_adapter = pxmitpriv->adapter;
pqueue = &pxmitpriv->pending_xmitbuf_queue;
@ -4154,7 +4154,7 @@ sint check_pending_xmitbuf(
thread_return rtw_xmit_thread(thread_context context)
{
s32 err;
PADAPTER padapter;
struct adapter *padapter;
err = _SUCCESS;
@ -4237,7 +4237,7 @@ void rtw_sctx_done(struct submit_ctx **sctx)
#ifdef CONFIG_XMIT_ACK
#ifdef CONFIG_XMIT_ACK_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
/**
* rtw_ack_tx_polling -
@ -4252,7 +4252,7 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
int ret = _FAIL;
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv);
struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv);
pack_tx_ops->submit_time = rtw_get_current_time();
pack_tx_ops->timeout_ms = timeout_ms;
@ -4288,13 +4288,13 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
#endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
#endif
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
#ifdef CONFIG_DETECT_C2H_BY_POLLING
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv);
struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv);
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter);
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
u8 check_c2hcmd;