From f523905d7a4e55aecb65e7623d8068a5b58b634c Mon Sep 17 00:00:00 2001 From: kimocoder Date: Thu, 14 Mar 2019 11:46:10 +0100 Subject: [PATCH] Remove struct net_device wrapper --- core/rtw_mlme_ext.c | 2 +- hal/rtl8812a/rtl8812a_cmd.c | 6 +++--- hal/rtl8812a/rtl8812a_hal_init.c | 4 ++-- hal/rtl8814a/rtl8814a_cmd.c | 16 ++++++++-------- include/drv_types.h | 8 ++++---- include/osdep_intf.h | 2 +- include/osdep_service.h | 10 ++++------ include/recv_osdep.h | 2 +- include/xmit_osdep.h | 6 +++--- os_dep/linux/os_intfs.c | 4 ++-- os_dep/linux/xmit_linux.c | 4 ++-- 11 files changed, 31 insertions(+), 33 deletions(-) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 8132057..9c38498 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -10498,7 +10498,7 @@ unsigned int send_beacon(_adapter *padapter) issue_beacon(padapter, 100); issue++; do { - rtw_yield_os(); + yield(); rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok)); poll++; } while ((poll % 10) != 0 && _FALSE == bxmitok && !RTW_CANNOT_RUN(padapter)); diff --git a/hal/rtl8812a/rtl8812a_cmd.c b/hal/rtl8812a/rtl8812a_cmd.c index e7e78b5..1e1f3d7 100644 --- a/hal/rtl8812a/rtl8812a_cmd.c +++ b/hal/rtl8812a/rtl8812a_cmd.c @@ -1083,7 +1083,7 @@ void rtl8812_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) rtw_hal_set_fw_rsvd_page(padapter, _FALSE); DLBcnCount++; do { - rtw_yield_os(); + yield(); /*rtw_mdelay_os(10);*/ /* check rsvd page download OK.*/ 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++; do { - rtw_yield_os(); + yield(); /*rtw_mdelay_os(10);*/ /* check rsvd page download OK.*/ 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); DLBcnCount++; do { - rtw_yield_os(); + yield(); /* rtw_mdelay_os(10); */ /* check rsvd page download OK. */ rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid)); diff --git a/hal/rtl8812a/rtl8812a_hal_init.c b/hal/rtl8812a/rtl8812a_hal_init.c index 8bbaf66..4519ec3 100644 --- a/hal/rtl8812a/rtl8812a_hal_init.c +++ b/hal/rtl8812a/rtl8812a_hal_init.c @@ -399,7 +399,7 @@ static s32 polling_fwdl_chksum(_adapter *adapter, u32 min_cnt, u32 timeout_ms) value32 = rtw_read32(adapter, REG_MCUFWDL); if (value32 & FWDL_ChkSum_rpt || RTW_CANNOT_IO(adapter)) break; - rtw_yield_os(); + yield(); } while (rtw_get_passing_time_ms(start) < timeout_ms || cnt < min_cnt); 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); if (value32 & WINTINI_RDY || RTW_CANNOT_IO(adapter)) break; - rtw_yield_os(); + yield(); } while (rtw_get_passing_time_ms(start) < timeout_ms || cnt < min_cnt); if (!(value32 & WINTINI_RDY)) diff --git a/hal/rtl8814a/rtl8814a_cmd.c b/hal/rtl8814a/rtl8814a_cmd.c index 6bec012..f01e956 100644 --- a/hal/rtl8814a/rtl8814a_cmd.c +++ b/hal/rtl8814a/rtl8814a_cmd.c @@ -836,7 +836,7 @@ void rtl8814_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) DLBcnCount++; do { - rtw_yield_os(); + yield(); //rtw_mdelay_os(10); // check rsvd page download OK. 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 { - rtw_yield_os(); + yield(); //rtw_mdelay_os(10); // check rsvd page download OK. rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid)); @@ -1168,7 +1168,7 @@ void rtl8814_iqk_done(_adapter* padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct submit_ctx *iqk_sctx = &pHalData->iqk_sctx; - + rtw_sctx_done(&iqk_sctx); } @@ -1354,7 +1354,7 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter) if (BufIndex < (MaxRsvdPageBufSize - PageSize)) { BufIndex = TxDescOffset + (MaxRsvdPageBufSize - PageSize); TotalPageNum = BCNQ_PAGE_NUM_8814-1; - + } /* 3 (6) BT Qos null data */ @@ -1401,8 +1401,8 @@ static void SetFwRsvdPagePkt_BTCoex(PADAPTER padapter) #ifdef CONFIG_WOWLAN rtl8814_set_FwAoacRsvdPage_cmd(padapter, &RsvdPageLoc); #endif - } - + } + return; error: @@ -1464,13 +1464,13 @@ void rtl8812a_download_BTCoex_AP_mode_rsvd_page(PADAPTER padapter) DLBcnCount++; do { - rtw_yield_os(); + yield(); //rtw_mdelay_os(10); // check rsvd page download OK. rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8*)(&bcn_valid)); poll++; } while (!bcn_valid && (poll%10) != 0 && !RTW_CANNOT_RUN(padapter)); - + } while (!bcn_valid && DLBcnCount <= 100 && !RTW_CANNOT_RUN(padapter)); if (RTW_CANNOT_RUN(padapter)) diff --git a/include/drv_types.h b/include/drv_types.h index 1b9917b..9a0eaf8 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -1067,7 +1067,7 @@ struct dvobj_priv { WCHAR active_path[MAX_ACTIVE_REG_PATH]; /* adapter regpath */ USB_EXTENSION usb_extension; - _nic_hdl pipehdls_r8192c[0x10]; + struct net_device *pipehdls_r8192c[0x10]; #endif u32 config_descriptor_len;/* ULONG UsbConfigurationDescriptorLength; */ @@ -1402,12 +1402,12 @@ struct _ADAPTER { #ifdef PLATFORM_LINUX - _nic_hdl pnetdev; + struct net_device *pnetdev; char old_ifname[IFNAMSIZ]; /* used by rtw_rereg_nd_name related function */ struct rereg_nd_name_data { - _nic_hdl old_pnetdev; + struct net_device *old_pnetdev; char old_ifname[IFNAMSIZ]; u8 old_ips_mode; u8 old_bRegUseLed; @@ -1437,7 +1437,7 @@ struct _ADAPTER { #endif /* PLATFORM_LINUX */ #ifdef PLATFORM_FREEBSD - _nic_hdl pifp; + struct net_device *pifp; int bup; _lock glock; #endif /* PLATFORM_FREEBSD */ diff --git a/include/osdep_intf.h b/include/osdep_intf.h index 66d7eaf..44bf0cd 100644 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -155,7 +155,7 @@ void rtw_drv_stop_vir_ifaces(struct dvobj_priv *dvobj); void rtw_drv_free_vir_ifaces(struct dvobj_priv *dvobj); #endif -void rtw_ndev_destructor(_nic_hdl ndev); +void rtw_ndev_destructor(struct net_device *ndev); #ifdef CONFIG_ARP_KEEP_ALIVE int rtw_gw_addr_query(_adapter *padapter); #endif diff --git a/include/osdep_service.h b/include/osdep_service.h index af5632b..3c4dd91 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -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); 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); -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 -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 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 @@ -220,9 +220,9 @@ struct sk_buff *_rtw_skb_alloc(u32 sz); void _rtw_skb_free(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); -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 -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 gro_result_t _rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb); #endif @@ -357,8 +357,6 @@ extern void rtw_mdelay_os(int ms); extern void rtw_udelay_os(int us); #endif -extern void rtw_yield_os(void); - extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc, void *ctx); diff --git a/include/recv_osdep.h b/include/recv_osdep.h index 58038e5..6e493bc 100644 --- a/include/recv_osdep.h +++ b/include/recv_osdep.h @@ -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 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); diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h index 70070a8..f1800b1 100644 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -53,7 +53,7 @@ extern NDIS_STATUS rtw_xmit_entry( #ifdef PLATFORM_FREEBSD #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); #endif /* PLATFORM_FREEBSD */ @@ -67,8 +67,8 @@ 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(_pkt *pkt, _nic_hdl pnetdev); +extern int _rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev); +extern int rtw_xmit_entry(_pkt *pkt, struct net_device *pnetdev); #endif /* PLATFORM_LINUX */ diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index d9c74d8..e77bbba 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -88,8 +88,8 @@ MODULE_PARM_DESC(rtw_lps_level, "The default LPS level"); */ int rtw_smart_ps = 2; -#ifdef CONFIG_WMMPS_STA -/* WMMPS: +#ifdef CONFIG_WMMPS_STA +/* WMMPS: * rtw_smart_ps = 0 => Only for fw test * rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap * rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap diff --git a/os_dep/linux/xmit_linux.c b/os_dep/linux/xmit_linux.c index 4a7b6c4..c3c657b 100644 --- a/os_dep/linux/xmit_linux.c +++ b/os_dep/linux/xmit_linux.c @@ -440,7 +440,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(_pkt *pkt, struct net_device *pnetdev) { _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -513,7 +513,7 @@ exit: 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);