mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-29 08:27:41 +00:00
Code Releases Activity

Remove struct net_device wrapper

Browse Source
This commit is contained in:
kimocoder 2019-03-14 11:46:10 +01:00
parent c69a032f51
commit f523905d7a
11 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rtw_mlme_ext.c
View File

@ -10498,7 +10498,7 @@ unsigned int send_beacon(_adapter *padapter)
issue_beacon(padapter, 100); issue_beacon(padapter, 100);
issue++; issue++;
do { do {
rtw_yield_os(); yield();
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok)); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok));
poll++; poll++;
} while ((poll % 10) != 0 && _FALSE == bxmitok && !RTW_CANNOT_RUN(padapter)); } while ((poll % 10) != 0 && _FALSE == bxmitok && !RTW_CANNOT_RUN(padapter));

6
hal/rtl8812a/rtl8812a_cmd.c
View File

@ -1083,7 +1083,7 @@ void rtl8812_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
rtw_hal_set_fw_rsvd_page(padapter, _FALSE); rtw_hal_set_fw_rsvd_page(padapter, _FALSE);
DLBcnCount++; DLBcnCount++;
do { do {
rtw_yield_os(); yield();
/*rtw_mdelay_os(10);*/ /*rtw_mdelay_os(10);*/
/* check rsvd page download OK.*/ /* check rsvd page download OK.*/
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid)); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));
@ -1127,7 +1127,7 @@ void rtl8812_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
DLBcnCount++; DLBcnCount++;
do { do {
rtw_yield_os(); yield();
/*rtw_mdelay_os(10);*/ /*rtw_mdelay_os(10);*/
/* check rsvd page download OK.*/ /* check rsvd page download OK.*/
rtw_hal_get_hwreg(padapter , HW_VAR_BCN_VALID , (u8 *)(&bcn_valid)); rtw_hal_get_hwreg(padapter , HW_VAR_BCN_VALID , (u8 *)(&bcn_valid));
@ -1506,7 +1506,7 @@ void rtl8812a_download_BTCoex_AP_mode_rsvd_page(PADAPTER padapter)
SetFwRsvdPagePkt_BTCoex(padapter); SetFwRsvdPagePkt_BTCoex(padapter);
DLBcnCount++; DLBcnCount++;
do { do {
rtw_yield_os(); yield();
/* rtw_mdelay_os(10); */ /* rtw_mdelay_os(10); */
/* check rsvd page download OK. */ /* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid)); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));

4
hal/rtl8812a/rtl8812a_hal_init.c
View File

@ -399,7 +399,7 @@ static s32 polling_fwdl_chksum(_adapter *adapter, u32 min_cnt, u32 timeout_ms)
value32 = rtw_read32(adapter, REG_MCUFWDL); value32 = rtw_read32(adapter, REG_MCUFWDL);
if (value32 & FWDL_ChkSum_rpt || RTW_CANNOT_IO(adapter)) if (value32 & FWDL_ChkSum_rpt || RTW_CANNOT_IO(adapter))
break; break;
rtw_yield_os(); yield();
} while (rtw_get_passing_time_ms(start) < timeout_ms || cnt < min_cnt); } while (rtw_get_passing_time_ms(start) < timeout_ms || cnt < min_cnt);
if (!(value32 & FWDL_ChkSum_rpt)) if (!(value32 & FWDL_ChkSum_rpt))
@ -437,7 +437,7 @@ static s32 _FWFreeToGo8812(_adapter *adapter, u32 min_cnt, u32 timeout_ms)
value32 = rtw_read32(adapter, REG_MCUFWDL); value32 = rtw_read32(adapter, REG_MCUFWDL);
if (value32 & WINTINI_RDY || RTW_CANNOT_IO(adapter)) if (value32 & WINTINI_RDY || RTW_CANNOT_IO(adapter))
break; break;
rtw_yield_os(); yield();
} while (rtw_get_passing_time_ms(start) < timeout_ms || cnt < min_cnt); } while (rtw_get_passing_time_ms(start) < timeout_ms || cnt < min_cnt);
if (!(value32 & WINTINI_RDY)) if (!(value32 & WINTINI_RDY))

6
hal/rtl8814a/rtl8814a_cmd.c
View File

@ -836,7 +836,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
DLBcnCount++; DLBcnCount++;
do do
{ {
rtw_yield_os(); yield();
//rtw_mdelay_os(10); //rtw_mdelay_os(10);
// check rsvd page download OK. // check rsvd page download OK.
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid)); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid));
@ -879,7 +879,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
do do
{ {
rtw_yield_os(); yield();
//rtw_mdelay_os(10); //rtw_mdelay_os(10);
// check rsvd page download OK. // check rsvd page download OK.
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid)); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid));
@ -1464,7 +1464,7 @@ void rtl8812a_download_BTCoex_AP_mode_rsvd_page(PADAPTER padapter)
DLBcnCount++; DLBcnCount++;
do do
{ {
rtw_yield_os(); yield();
//rtw_mdelay_os(10); //rtw_mdelay_os(10);
// check rsvd page download OK. // check rsvd page download OK.
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid)); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid));

8
include/drv_types.h
View File

@ -1067,7 +1067,7 @@ struct dvobj_priv {
WCHAR active_path[MAX_ACTIVE_REG_PATH]; /* adapter regpath */ WCHAR active_path[MAX_ACTIVE_REG_PATH]; /* adapter regpath */
USB_EXTENSION usb_extension; USB_EXTENSION usb_extension;
_nic_hdl pipehdls_r8192c[0x10]; struct net_device *pipehdls_r8192c[0x10];
#endif #endif
u32 config_descriptor_len;/* ULONG UsbConfigurationDescriptorLength; */ u32 config_descriptor_len;/* ULONG UsbConfigurationDescriptorLength; */
@ -1402,12 +1402,12 @@ struct _ADAPTER {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
_nic_hdl pnetdev; struct net_device *pnetdev;
char old_ifname[IFNAMSIZ]; char old_ifname[IFNAMSIZ];
/* used by rtw_rereg_nd_name related function */ /* used by rtw_rereg_nd_name related function */
struct rereg_nd_name_data { struct rereg_nd_name_data {
_nic_hdl old_pnetdev; struct net_device *old_pnetdev;
char old_ifname[IFNAMSIZ]; char old_ifname[IFNAMSIZ];
u8 old_ips_mode; u8 old_ips_mode;
u8 old_bRegUseLed; u8 old_bRegUseLed;
@ -1437,7 +1437,7 @@ struct _ADAPTER {
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */
#ifdef PLATFORM_FREEBSD #ifdef PLATFORM_FREEBSD
_nic_hdl pifp; struct net_device *pifp;
int bup; int bup;
_lock glock; _lock glock;
#endif /* PLATFORM_FREEBSD */ #endif /* PLATFORM_FREEBSD */

2
include/osdep_intf.h
View File

@ -155,7 +155,7 @@ void rtw_drv_stop_vir_ifaces(struct dvobj_priv *dvobj);
void rtw_drv_free_vir_ifaces(struct dvobj_priv *dvobj); void rtw_drv_free_vir_ifaces(struct dvobj_priv *dvobj);
#endif #endif
void rtw_ndev_destructor(_nic_hdl ndev); void rtw_ndev_destructor(struct net_device *ndev);
#ifdef CONFIG_ARP_KEEP_ALIVE #ifdef CONFIG_ARP_KEEP_ALIVE
int rtw_gw_addr_query(_adapter *padapter); int rtw_gw_addr_query(_adapter *padapter);
#endif #endif

10
include/osdep_service.h
View File

@ -148,9 +148,9 @@ struct sk_buff *dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f flags, c
void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line); void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line);
struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line); struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line);
struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line); struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line);
int dbg_rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line); int dbg_rtw_netif_rx(struct net_device *ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line);
#ifdef CONFIG_RTW_NAPI #ifdef CONFIG_RTW_NAPI
int dbg_rtw_netif_receive_skb(_nic_hdl ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line); int dbg_rtw_netif_receive_skb(struct net_device *ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line);
#ifdef CONFIG_RTW_GRO #ifdef CONFIG_RTW_GRO
gro_result_t dbg_rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line); gro_result_t dbg_rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line);
#endif #endif
@ -220,9 +220,9 @@ struct sk_buff *_rtw_skb_alloc(u32 sz);
void _rtw_skb_free(struct sk_buff *skb); void _rtw_skb_free(struct sk_buff *skb);
struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb); struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb);
struct sk_buff *_rtw_skb_clone(struct sk_buff *skb); struct sk_buff *_rtw_skb_clone(struct sk_buff *skb);
int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); int _rtw_netif_rx(struct net_device *ndev, struct sk_buff *skb);
#ifdef CONFIG_RTW_NAPI #ifdef CONFIG_RTW_NAPI
int _rtw_netif_receive_skb(_nic_hdl ndev, struct sk_buff *skb); int _rtw_netif_receive_skb(struct net_device *ndev, struct sk_buff *skb);
#ifdef CONFIG_RTW_GRO #ifdef CONFIG_RTW_GRO
gro_result_t _rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb); gro_result_t _rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb);
#endif #endif
@ -357,8 +357,6 @@ extern void rtw_mdelay_os(int ms);
extern void rtw_udelay_os(int us); extern void rtw_udelay_os(int us);
#endif #endif
extern void rtw_yield_os(void);
extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc, void *ctx); extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc, void *ctx);

2
include/recv_osdep.h
View File

@ -22,7 +22,7 @@ extern void _rtw_free_recv_priv(struct recv_priv *precvpriv);
extern s32 rtw_recv_entry(union recv_frame *precv_frame); extern s32 rtw_recv_entry(union recv_frame *precv_frame);
extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame); extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame);
extern void rtw_recv_returnpacket(IN _nic_hdl cnxt, IN _pkt *preturnedpkt); extern void rtw_recv_returnpacket(struct net_device *cnxt, _pkt *preturnedpkt);
extern int rtw_recv_monitor(_adapter *padapter, union recv_frame *precv_frame); extern int rtw_recv_monitor(_adapter *padapter, union recv_frame *precv_frame);

6
include/xmit_osdep.h
View File

@ -53,7 +53,7 @@ extern NDIS_STATUS rtw_xmit_entry(
#ifdef PLATFORM_FREEBSD #ifdef PLATFORM_FREEBSD
#define NR_XMITFRAME 256 #define NR_XMITFRAME 256
extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); extern int rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev);
extern void rtw_xmit_entry_wrap(struct ifnet *pifp); extern void rtw_xmit_entry_wrap(struct ifnet *pifp);
#endif /* PLATFORM_FREEBSD */ #endif /* PLATFORM_FREEBSD */
@ -67,8 +67,8 @@ struct sta_xmit_priv;
struct xmit_frame; struct xmit_frame;
struct xmit_buf; struct xmit_buf;
extern int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); extern int _rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev);
extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); extern int rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev);
#endif /* PLATFORM_LINUX */ #endif /* PLATFORM_LINUX */

4
os_dep/linux/xmit_linux.c
View File

@ -440,7 +440,7 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
#endif /* CONFIG_TX_MCAST2UNI */ #endif /* CONFIG_TX_MCAST2UNI */
int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) int _rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev)
{ {
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -513,7 +513,7 @@ exit:
return 0; return 0;
} }
int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) int rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev)
{ {
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);