OSDN -- Develop and Download Open Source Software

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-modules-rtl8723au: Commit

external/modules/rtl8723au


Commit MetaInfo

Revisiona1bb9851fc734c62e1d2131aaefb0ee7a9f28eb5 (tree)
Time2013-12-07 14:56:19
AuthorLarry Finger <Larry.Finger@lwfi...>
CommiterLarry Finger

Log Message

rtl8723au: Remove typedef for _pkt and replace with correct struct

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

Change Summary

Incremental Difference

--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -2269,7 +2269,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
22692269 unsigned char *pdata;
22702270 struct rx_pkt_attrib *pattrib;
22712271 unsigned char *data_ptr;
2272- _pkt *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
2272+ struct sk_buff *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
22732273 struct recv_priv *precvpriv = &padapter->recvpriv;
22742274 _queue *pfree_recv_queue = &(precvpriv->free_recv_queue);
22752275 int ret = _SUCCESS;
--- 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)
570570 pattrib->subtype = WIFI_QOS_DATA_TYPE;
571571 }
572572
573-static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)
573+static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)
574574 {
575575 uint i;
576576 struct pkt_file pktfile;
@@ -1578,7 +1578,7 @@ This sub-routine will perform all the following:
15781578 6. apply sw-encrypt, if necessary.
15791579
15801580 */
1581-s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
1581+s32 rtw_xmitframe_coalesce(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
15821582 {
15831583 struct pkt_file pktfile;
15841584
@@ -2211,7 +2211,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
22112211 {
22122212 _queue *queue = NULL;
22132213 _adapter *padapter = pxmitpriv->adapter;
2214- _pkt *pndis_pkt = NULL;
2214+ struct sk_buff *pndis_pkt = NULL;
22152215
22162216 _func_enter_;
22172217
@@ -2854,7 +2854,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
28542854 * 0 success, hardware will handle this xmit frame(packet)
28552855 * <0 fail
28562856 */
2857-s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
2857+s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt)
28582858 {
28592859 static u32 start = 0;
28602860 static u32 drop_cnt = 0;
--- 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)
562562 s32 transfer_len;
563563 struct recv_stat *prxstat;
564564 struct phy_stat *pphy_info = NULL;
565- _pkt *pkt_copy = NULL;
565+ struct sk_buff *pkt_copy = NULL;
566566 union recv_frame *precvframe = NULL;
567567 struct rx_pkt_attrib *pattrib = NULL;
568568 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
926926 //clone/copy to if2
927927 u8 shift_sz = 0;
928928 u32 alloc_sz, skb_len;
929- _pkt *pkt_copy = NULL;
929+ struct sk_buff *pkt_copy = NULL;
930930 struct rx_pkt_attrib *pattrib = NULL;
931931
932932 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
10111011
10121012 }
10131013
1014-static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
1014+static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
10151015 {
10161016 u8 *pbuf;
10171017 u8 shift_sz = 0;
@@ -1020,7 +1020,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
10201020 s32 transfer_len;
10211021 struct recv_stat *prxstat;
10221022 struct phy_stat *pphy_info = NULL;
1023- _pkt *pkt_copy = NULL;
1023+ struct sk_buff *pkt_copy = NULL;
10241024 union recv_frame *precvframe = NULL;
10251025 struct rx_pkt_attrib *pattrib = NULL;
10261026 HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@@ -1195,7 +1195,7 @@ _exit_recvbuf2recvframe:
11951195
11961196 void rtl8192cu_recv_tasklet(void *priv)
11971197 {
1198- _pkt *pskb;
1198+ struct sk_buff *pskb;
11991199 _adapter *padapter = (_adapter*)priv;
12001200 struct recv_priv *precvpriv = &padapter->recvpriv;
12011201
--- a/include/hal_intf.h
+++ b/include/hal_intf.h
@@ -227,7 +227,7 @@ struct hal_ops {
227227 void (*write_rfreg)(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
228228
229229 #ifdef CONFIG_HOSTAPD_MLME
230- s32 (*hostap_mgnt_xmit_entry)(_adapter *padapter, _pkt *pkt);
230+ s32 (*hostap_mgnt_xmit_entry)(_adapter *padapter, struct sk_buff *pkt);
231231 #endif
232232
233233 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
411411 #endif
412412
413413 #ifdef CONFIG_HOSTAPD_MLME
414-s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt);
414+s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, struct sk_buff *pkt);
415415 #endif
416416
417417 #ifdef DBG_CONFIG_ERROR_DETECT
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -90,8 +90,6 @@ struct __queue {
9090 spinlock_t lock;
9191 };
9292
93-typedef struct sk_buff _pkt;
94-
9593 typedef struct __queue _queue;
9694 typedef struct net_device * _nic_hdl;
9795
--- a/include/recv_osdep.h
+++ b/include/recv_osdep.h
@@ -31,10 +31,10 @@ extern void _rtw_free_recv_priv (struct recv_priv *precvpriv);
3131
3232 extern s32 rtw_recv_entry(union recv_frame *precv_frame);
3333 extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame);
34-extern void rtw_recv_returnpacket(_nic_hdl cnxt, _pkt *preturnedpkt);
34+extern void rtw_recv_returnpacket(_nic_hdl cnxt, struct sk_buff *preturnedpkt);
3535
3636 extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame);
37-extern void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup);
37+extern void rtw_handle_tkip_mic_err(_adapter *padapter, u8 bgroup);
3838
3939
4040 int rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter);
--- a/include/rtl8192c_xmit.h
+++ b/include/rtl8192c_xmit.h
@@ -135,7 +135,7 @@ s32 rtl8192cu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe);
135135 s32 rtl8192cu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe);
136136
137137 #ifdef CONFIG_HOSTAPD_MLME
138-s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt);
138+s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, struct sk_buff *pkt);
139139 #endif
140140
141141 #endif
--- a/include/rtw_recv.h
+++ b/include/rtw_recv.h
@@ -345,7 +345,7 @@ struct recv_buf
345345
346346 u8 irp_pending;
347347 int transfer_len;
348- _pkt *pskb;
348+ struct sk_buff *pskb;
349349 u8 reuse;
350350 };
351351
@@ -372,8 +372,8 @@ struct recv_frame_hdr
372372 struct sk_buff *pkt;
373373 struct sk_buff *pkt_newalloc;
374374 #else // CONFIG_BSD_RX_USE_MBUF
375- _pkt *pkt;
376- _pkt *pkt_newalloc;
375+ struct sk_buff *pkt;
376+ struct sk_buff *pkt_newalloc;
377377 #endif // CONFIG_BSD_RX_USE_MBUF
378378
379379 _adapter *adapter;
@@ -588,7 +588,7 @@ static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem)
588588
589589 }
590590
591-static inline union recv_frame *pkt_to_recvframe(_pkt *pkt)
591+static inline union recv_frame *pkt_to_recvframe(struct sk_buff *pkt)
592592 {
593593
594594 u8 * buf_star;
@@ -598,7 +598,7 @@ static inline union recv_frame *pkt_to_recvframe(_pkt *pkt)
598598 return precv_frame;
599599 }
600600
601-static inline u8 *pkt_to_recvmem(_pkt *pkt)
601+static inline u8 *pkt_to_recvmem(struct sk_buff *pkt)
602602 {
603603 // return the rx_head
604604
@@ -608,7 +608,7 @@ static inline u8 *pkt_to_recvmem(_pkt *pkt)
608608
609609 }
610610
611-static inline u8 *pkt_to_recvdata(_pkt *pkt)
611+static inline u8 *pkt_to_recvdata(struct sk_buff *pkt)
612612 {
613613 // return the rx_data
614614
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -263,20 +263,13 @@ struct xmit_buf
263263 #endif
264264 };
265265
266-struct xmit_frame
267-{
266+struct xmit_frame {
268267 struct list_head list;
269-
270268 struct pkt_attrib attrib;
271-
272- _pkt *pkt;
273-
269+ struct sk_buff *pkt;
274270 int frame_tag;
275-
276271 _adapter *padapter;
277-
278272 u8 *buf_addr;
279-
280273 struct xmit_buf *pxmitbuf;
281274
282275 #ifdef CONFIG_USB_TX_AGGREGATION
@@ -461,7 +454,7 @@ extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct
461454 extern s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe);
462455 extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib);
463456 #define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib)
464-extern s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe);
457+extern s32 rtw_xmitframe_coalesce(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe);
465458 #ifdef CONFIG_TDLS
466459 s32 rtw_xmit_tdls_coalesce(_adapter *padapter, struct xmit_frame *pxmitframe, u8 action);
467460 #endif
@@ -482,7 +475,7 @@ void rtw_alloc_hwxmits(_adapter *padapter);
482475 void rtw_free_hwxmits(_adapter *padapter);
483476
484477
485-s32 rtw_xmit(_adapter *padapter, _pkt **pkt);
478+s32 rtw_xmit(_adapter *padapter, struct sk_buff **pkt);
486479
487480 #if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS)
488481 int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe);
--- a/include/xmit_osdep.h
+++ b/include/xmit_osdep.h
@@ -25,7 +25,7 @@
2525 #include <drv_types.h>
2626
2727 struct pkt_file {
28- _pkt *pkt;
28+ struct sk_buff *pkt;
2929 __kernel_size_t pkt_len; //the remainder length of the open_file
3030 unsigned char *cur_buffer;
3131 u8 *buf_start;
@@ -42,21 +42,21 @@ struct sta_xmit_priv;
4242 struct xmit_frame;
4343 struct xmit_buf;
4444
45-extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
45+extern int rtw_xmit_entry(struct sk_buff *pkt, _nic_hdl pnetdev);
4646
4747 void rtw_os_xmit_schedule(_adapter *padapter);
4848
4949 int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz);
5050 void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz);
5151
52-extern void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib);
52+extern void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib);
5353
5454 extern uint rtw_remainder_len(struct pkt_file *pfile);
55-extern void _rtw_open_pktfile(_pkt *pkt, struct pkt_file *pfile);
55+extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
5656 extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen);
5757 extern int rtw_endofpktfile (struct pkt_file *pfile);
5858
59-extern void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt);
59+extern void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt);
6060 extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe);
6161
6262 #endif //__XMIT_OSDEP_H_
--- 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)
193193 void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
194194 {
195195 #ifdef CONFIG_HOSTAPD_MLME
196- _pkt *skb;
196+ struct sk_buff *skb;
197197 struct hostapd_priv *phostapdpriv = padapter->phostapdpriv;
198198 struct net_device *pmgnt_netdev = phostapdpriv->pmgnt_netdev;
199199
@@ -235,7 +235,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
235235 {
236236 struct recv_priv *precvpriv;
237237 _queue *pfree_recv_queue;
238- _pkt *skb;
238+ struct sk_buff *skb;
239239 struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
240240 #ifdef CONFIG_TCP_CSUM_OFFLOAD_RX
241241 struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -280,7 +280,7 @@ _func_enter_;
280280
281281 if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
282282 {
283- _pkt *pskb2=NULL;
283+ struct sk_buff *pskb2=NULL;
284284 struct sta_info *psta = NULL;
285285 struct sta_priv *pstapriv = &padapter->stapriv;
286286 struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
--- a/os_dep/xmit_linux.c
+++ b/os_dep/xmit_linux.c
@@ -36,7 +36,7 @@ uint rtw_remainder_len(struct pkt_file *pfile)
3636 return (pfile->buf_len - ((unsigned long)(pfile->cur_addr) - (unsigned long)(pfile->buf_start)));
3737 }
3838
39-void _rtw_open_pktfile (_pkt *pktptr, struct pkt_file *pfile)
39+void _rtw_open_pktfile (struct sk_buff *pktptr, struct pkt_file *pfile)
4040 {
4141 _func_enter_;
4242
@@ -83,7 +83,7 @@ _func_exit_;
8383 return _FALSE;
8484 }
8585
86-void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
86+void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib)
8787 {
8888
8989 #ifdef CONFIG_TCP_CSUM_OFFLOAD_TX
@@ -186,7 +186,7 @@ void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
186186
187187 #define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)
188188
189-void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt)
189+void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt)
190190 {
191191 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
192192 u16 queue;
@@ -245,7 +245,7 @@ void rtw_os_xmit_schedule(_adapter *padapter)
245245 spin_unlock_bh(&pxmitpriv->lock);
246246 }
247247
248-static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)
248+static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt)
249249 {
250250 struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
251251 #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@@ -342,7 +342,7 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
342342 #endif // CONFIG_TX_MCAST2UNI
343343
344344
345-int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
345+int rtw_xmit_entry(struct sk_buff *pkt, _nic_hdl pnetdev)
346346 {
347347 _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
348348 struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
Show on old repository browser