rtl8188eu: Convert typedef for _pkt into struct sk_buff

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-24 17:03:54 -05:00
parent 9c56f20d4c
commit 3e3d47445a
11 changed files with 30 additions and 46 deletions

View file

@ -74,7 +74,6 @@
spinlock_t lock;
};
typedef struct sk_buff _pkt;
typedef unsigned char _buffer;
typedef struct __queue _queue;

View file

@ -30,7 +30,7 @@ extern void _rtw_free_recv_priv (struct recv_priv *precvpriv);
extern s32 rtw_recv_entry(union recv_frame *precv_frame);
extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame);
extern void rtw_recv_returnpacket(_nic_hdl cnxt, _pkt *preturnedpkt);
extern void rtw_recv_returnpacket(_nic_hdl cnxt, struct sk_buff *preturnedpkt);
extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame);
extern void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup);

View file

@ -109,7 +109,7 @@ struct mp_xmit_frame
struct pkt_attrib attrib;
_pkt *pkt;
struct sk_buff *pkt;
int frame_tag;

View file

@ -115,7 +115,7 @@ struct phy_info //ODM_PHY_INFO_T
u8 RxSNR[MAX_PATH_NUM_92CS];//per-path's SNR
};
struct rx_pkt_attrib {
struct rx_pkt_attrib {
u16 pkt_len;
u8 physt;
u8 drvinfo_sz;
@ -246,19 +246,10 @@ struct sta_recv_priv {
spinlock_t lock;
sint option;
//_queue blk_strms[MAX_RX_NUMBLKS];
_queue defrag_q; //keeping the fragment frame until defrag
struct stainfo_rxcache rxcache;
//uint sta_rx_bytes;
//uint sta_rx_pkts;
//uint sta_rx_fail;
};
struct recv_buf
{
_list list;
@ -283,7 +274,7 @@ struct recv_buf
u8 irp_pending;
int transfer_len;
_pkt *pskb;
struct sk_buff *pskb;
u8 reuse;
};
@ -508,7 +499,7 @@ __inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem)
}
__inline static union recv_frame *pkt_to_recvframe(_pkt *pkt)
__inline static union recv_frame *pkt_to_recvframe(struct sk_buff *pkt)
{
u8 * buf_star;
@ -518,7 +509,7 @@ __inline static union recv_frame *pkt_to_recvframe(_pkt *pkt)
return precv_frame;
}
__inline static u8 *pkt_to_recvmem(_pkt *pkt)
__inline static u8 *pkt_to_recvmem(struct sk_buff *pkt)
{
// return the rx_head
@ -528,7 +519,7 @@ __inline static u8 *pkt_to_recvmem(_pkt *pkt)
}
__inline static u8 *pkt_to_recvdata(_pkt *pkt)
__inline static u8 *pkt_to_recvdata(struct sk_buff *pkt)
{
// return the rx_data

View file

@ -233,7 +233,7 @@ struct xmit_frame
{
_list list;
struct pkt_attrib attrib;
_pkt *pkt;
struct sk_buff *pkt;
int frame_tag;
_adapter *padapter;
u8 *buf_addr;
@ -267,12 +267,6 @@ struct sta_xmit_priv
_list apsd;
u16 txseq_tid[16];
//uint sta_tx_bytes;
//u64 sta_tx_pkts;
//uint sta_tx_fail;
};
@ -389,7 +383,7 @@ extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct
extern s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe);
extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib);
#define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib)
extern s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe);
extern s32 rtw_xmitframe_coalesce(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe);
s32 _rtw_init_hw_txqueue(struct hw_txqueue* phw_txqueue, u8 ac_tag);
void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv);
@ -407,7 +401,7 @@ void rtw_alloc_hwxmits(_adapter *padapter);
void rtw_free_hwxmits(_adapter *padapter);
s32 rtw_xmit(_adapter *padapter, _pkt **pkt);
s32 rtw_xmit(_adapter *padapter, struct sk_buff **pkt);
#if defined(CONFIG_AP_MODE)
sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe);

View file

@ -24,7 +24,7 @@
#include <drv_types.h>
struct pkt_file {
_pkt *pkt;
struct sk_buff *pkt;
size_t pkt_len; //the remainder length of the open_file
_buffer *cur_buffer;
u8 *buf_start;
@ -46,21 +46,21 @@ struct sta_xmit_priv;
struct xmit_frame;
struct xmit_buf;
extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
extern int rtw_xmit_entry(struct sk_buff *pkt, _nic_hdl pnetdev);
void rtw_os_xmit_schedule(_adapter *padapter);
int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz);
void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz);
extern void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib);
extern void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib);
extern uint rtw_remainder_len(struct pkt_file *pfile);
extern void _rtw_open_pktfile(_pkt *pkt, struct pkt_file *pfile);
extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen);
extern sint rtw_endofpktfile (struct pkt_file *pfile);
extern void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt);
extern void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt);
extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe);
#endif //__XMIT_OSDEP_H_