rtl8723au: Remove typedef for _pkt and replace with correct struct

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index c1ecb3e..2fa9011 100644 (file)
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -2269,7 +2269,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
        unsigned char *pdata;
        struct rx_pkt_attrib *pattrib;
        unsigned char *data_ptr;
-       _pkt *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
+       struct sk_buff *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
        struct recv_priv *precvpriv = &padapter->recvpriv;
        _queue *pfree_recv_queue = &(precvpriv->free_recv_queue);
        int     ret = _SUCCESS;

diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index dae829d..d22a0f9 100644 (file)
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -570,7 +570,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(_adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)
 {
        uint i;
        struct pkt_file pktfile;
@@ -1578,7 +1578,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(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
 {
        struct pkt_file pktfile;
 
@@ -2211,7 +2211,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
 {
        _queue *queue = NULL;
        _adapter *padapter = pxmitpriv->adapter;
-       _pkt *pndis_pkt = NULL;
+       struct sk_buff *pndis_pkt = NULL;
 
 _func_enter_;
 
@@ -2854,7 +2854,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(_adapter *padapter, struct sk_buff **ppkt)
 {
        static u32 start = 0;
        static u32 drop_cnt = 0;

diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c
index 8e16196..3bac983 100644 (file)
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -562,7 +562,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
        s32     transfer_len;
        struct recv_stat        *prxstat;
        struct phy_stat *pphy_info = NULL;
-       _pkt                            *pkt_copy = NULL;
+       struct sk_buff          *pkt_copy = NULL;
        union recv_frame        *precvframe = NULL;
        struct rx_pkt_attrib    *pattrib = NULL;
        HAL_DATA_TYPE           *pHalData = GET_HAL_DATA(padapter);
@@ -926,7 +926,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
                        //clone/copy to if2
                        u8 shift_sz = 0;
                        u32 alloc_sz, skb_len;
-                       _pkt     *pkt_copy = NULL;
+                       struct sk_buff   *pkt_copy = NULL;
                        struct rx_pkt_attrib *pattrib = NULL;
 
                        precvframe_if2 = rtw_alloc_recvframe(pfree_recv_queue);
@@ -1011,7 +1011,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
 
 }
 
-static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
+static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
 {
        u8      *pbuf;
        u8      shift_sz = 0;
@@ -1020,7 +1020,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
        s32     transfer_len;
        struct recv_stat        *prxstat;
        struct phy_stat *pphy_info = NULL;
-       _pkt                            *pkt_copy = NULL;
+       struct sk_buff          *pkt_copy = NULL;
        union recv_frame        *precvframe = NULL;
        struct rx_pkt_attrib    *pattrib = NULL;
        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(padapter);
@@ -1195,7 +1195,7 @@ _exit_recvbuf2recvframe:
 
 void rtl8192cu_recv_tasklet(void *priv)
 {
-       _pkt                    *pskb;
+       struct sk_buff          *pskb;
        _adapter                *padapter = (_adapter*)priv;
        struct recv_priv        *precvpriv = &padapter->recvpriv;
 

diff --git a/include/hal_intf.h b/include/hal_intf.h
index 64cc472..d5d4c8b 100644 (file)
--- a/include/hal_intf.h
+++ b/include/hal_intf.h
@@ -227,7 +227,7 @@ struct hal_ops {
        void    (*write_rfreg)(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
 
 #ifdef CONFIG_HOSTAPD_MLME
-       s32     (*hostap_mgnt_xmit_entry)(_adapter *padapter, _pkt *pkt);
+       s32     (*hostap_mgnt_xmit_entry)(_adapter *padapter, struct sk_buff *pkt);
 #endif
 
        void (*EfusePowerSwitch)(_adapter *padapter, u8 bWrite, u8 PwrState);
@@ -411,7 +411,7 @@ void        rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_B
 #endif
 
 #ifdef CONFIG_HOSTAPD_MLME
-s32    rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt);
+s32    rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, struct sk_buff *pkt);
 #endif
 
 #ifdef DBG_CONFIG_ERROR_DETECT

diff --git a/include/osdep_service.h b/include/osdep_service.h
index dbab5c6..c4b4916 100644 (file)
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -90,8 +90,6 @@ struct        __queue {
        spinlock_t              lock;
 };
 
-typedef        struct sk_buff  _pkt;
-
 typedef struct __queue _queue;
 typedef        struct  net_device * _nic_hdl;
 

diff --git a/include/recv_osdep.h b/include/recv_osdep.h
index 118f7e7..ea24678 100644 (file)
--- a/include/recv_osdep.h
+++ b/include/recv_osdep.h
@@ -31,10 +31,10 @@ 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);
+extern void rtw_handle_tkip_mic_err(_adapter *padapter, u8 bgroup);
 
 
 int    rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter);

diff --git a/include/rtl8192c_xmit.h b/include/rtl8192c_xmit.h
index f3bf06d..368d9eb 100644 (file)
--- a/include/rtl8192c_xmit.h
+++ b/include/rtl8192c_xmit.h
@@ -135,7 +135,7 @@ s32 rtl8192cu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe);
 s32 rtl8192cu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe);
 
 #ifdef CONFIG_HOSTAPD_MLME
-s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt);
+s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, struct sk_buff *pkt);
 #endif
 
 #endif

diff --git a/include/rtw_recv.h b/include/rtw_recv.h
index 5987315..d2fd564 100644 (file)
--- a/include/rtw_recv.h
+++ b/include/rtw_recv.h
@@ -345,7 +345,7 @@ struct recv_buf
 
        u8  irp_pending;
        int  transfer_len;
-       _pkt    *pskb;
+       struct sk_buff *pskb;
        u8      reuse;
 };
 
@@ -372,8 +372,8 @@ struct recv_frame_hdr
        struct sk_buff   *pkt;
        struct sk_buff   *pkt_newalloc;
 #else // CONFIG_BSD_RX_USE_MBUF
-       _pkt    *pkt;
-       _pkt *pkt_newalloc;
+       struct sk_buff *pkt;
+       struct sk_buff *pkt_newalloc;
 #endif // CONFIG_BSD_RX_USE_MBUF
 
        _adapter  *adapter;
@@ -588,7 +588,7 @@ static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem)
 
 }
 
-static inline union recv_frame *pkt_to_recvframe(_pkt *pkt)
+static inline union recv_frame *pkt_to_recvframe(struct sk_buff *pkt)
 {
 
        u8 * buf_star;
@@ -598,7 +598,7 @@ static inline union recv_frame *pkt_to_recvframe(_pkt *pkt)
        return precv_frame;
 }
 
-static inline u8 *pkt_to_recvmem(_pkt *pkt)
+static inline u8 *pkt_to_recvmem(struct sk_buff *pkt)
 {
        // return the rx_head
 
@@ -608,7 +608,7 @@ static inline u8 *pkt_to_recvmem(_pkt *pkt)
 
 }
 
-static inline u8 *pkt_to_recvdata(_pkt *pkt)
+static inline u8 *pkt_to_recvdata(struct sk_buff *pkt)
 {
        // return the rx_data
 

diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h
index 4ee4bf0..41a2a5a 100644 (file)
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -263,20 +263,13 @@ struct xmit_buf
 #endif
 };
 
-struct xmit_frame
-{
+struct xmit_frame {
        struct list_head        list;
-
        struct pkt_attrib attrib;
-
-       _pkt *pkt;
-
+       struct sk_buff *pkt;
        int     frame_tag;
-
        _adapter *padapter;
-
        u8      *buf_addr;
-
        struct xmit_buf *pxmitbuf;
 
 #ifdef CONFIG_USB_TX_AGGREGATION
@@ -461,7 +454,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);
 #ifdef CONFIG_TDLS
 s32 rtw_xmit_tdls_coalesce(_adapter *padapter, struct xmit_frame *pxmitframe, u8 action);
 #endif
@@ -482,7 +475,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) || defined(CONFIG_TDLS)
 int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe);

diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h
index 5bdcb78..ffc8994 100644 (file)
--- a/include/xmit_osdep.h
+++ b/include/xmit_osdep.h
@@ -25,7 +25,7 @@
 #include <drv_types.h>
 
 struct pkt_file {
-       _pkt *pkt;
+       struct sk_buff *pkt;
        __kernel_size_t pkt_len;         //the remainder length of the open_file
        unsigned char *cur_buffer;
        u8 *buf_start;
@@ -42,21 +42,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 int 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_

diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c
index 846ca6a..fdf550c 100644 (file)
--- a/os_dep/recv_linux.c
+++ b/os_dep/recv_linux.c
@@ -193,7 +193,7 @@ void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)
 void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
 {
 #ifdef CONFIG_HOSTAPD_MLME
-       _pkt *skb;
+       struct sk_buff *skb;
        struct hostapd_priv *phostapdpriv  = padapter->phostapdpriv;
        struct net_device *pmgnt_netdev = phostapdpriv->pmgnt_netdev;
 
@@ -235,7 +235,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
 {
        struct recv_priv *precvpriv;
        _queue  *pfree_recv_queue;
-       _pkt *skb;
+       struct sk_buff *skb;
        struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
 #ifdef CONFIG_TCP_CSUM_OFFLOAD_RX
        struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -280,7 +280,7 @@ _func_enter_;
 
        if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
        {
-               _pkt *pskb2=NULL;
+               struct sk_buff *pskb2=NULL;
                struct sta_info *psta = NULL;
                struct sta_priv *pstapriv = &padapter->stapriv;
                struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;

diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c
index 2f6fbbe..c986912 100644 (file)
--- a/os_dep/xmit_linux.c
+++ b/os_dep/xmit_linux.c
@@ -36,7 +36,7 @@ uint rtw_remainder_len(struct pkt_file *pfile)
        return (pfile->buf_len - ((unsigned long)(pfile->cur_addr) - (unsigned long)(pfile->buf_start)));
 }
 
-void _rtw_open_pktfile (_pkt *pktptr, struct pkt_file *pfile)
+void _rtw_open_pktfile (struct sk_buff *pktptr, struct pkt_file *pfile)
 {
 _func_enter_;
 
@@ -83,7 +83,7 @@ _func_exit_;
        return _FALSE;
 }
 
-void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
+void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib)
 {
 
 #ifdef CONFIG_TCP_CSUM_OFFLOAD_TX
@@ -186,7 +186,7 @@ void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
 
 #define WMM_XMIT_THRESHOLD     (NR_XMITFRAME*2/5)
 
-void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt)
+void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt)
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        u16     queue;
@@ -245,7 +245,7 @@ void rtw_os_xmit_schedule(_adapter *padapter)
        spin_unlock_bh(&pxmitpriv->lock);
 }
 
-static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)
+static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt)
 {
        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@@ -342,7 +342,7 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
 #endif // CONFIG_TX_MCAST2UNI
 
 
-int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
+int rtw_xmit_entry(struct sk_buff *pkt, _nic_hdl pnetdev)
 {
        _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;