From ee237545ff97ffbddb5cb95ff471c168dc1d62e3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 25 Jul 2013 10:53:16 -0500 Subject: [PATCH] rtl8188eu: Convert typedef for _nic_hdl to struct net_device * Signed-off-by: Larry Finger --- include/drv_types.h | 4 ++-- include/osdep_service.h | 4 +--- include/recv_osdep.h | 2 +- include/rtw_ioctl.h | 4 ++-- include/xmit_osdep.h | 2 +- os_dep/os_intfs.c | 2 +- os_dep/xmit_linux.c | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/drv_types.h b/include/drv_types.h index 320f5c6..97509c2 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -301,11 +301,11 @@ struct _ADAPTER{ void *recvThread; void (*intf_start)(_adapter * adapter); void (*intf_stop)(_adapter * adapter); - _nic_hdl pnetdev; + struct net_device *pnetdev; // 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; diff --git a/include/osdep_service.h b/include/osdep_service.h index a3e5982..59d9e15 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -74,8 +74,6 @@ spinlock_t lock; }; - typedef struct net_device * _nic_hdl; - #define thread_exit() complete_and_exit(NULL, 0) typedef void timer_hdl_return; @@ -180,7 +178,7 @@ __inline static void rtw_list_delete(struct list_head *plist) list_del_init(plist); } -__inline static void _init_timer(struct timer_list *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx) +__inline static void _init_timer(struct timer_list *ptimer,struct net_device *nic_hdl,void *pfunc,void* cntx) { ptimer->function = pfunc; ptimer->data = (unsigned long)cntx; diff --git a/include/recv_osdep.h b/include/recv_osdep.h index 16e70d4..27eee7a 100644 --- a/include/recv_osdep.h +++ b/include/recv_osdep.h @@ -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, struct sk_buff *preturnedpkt); +extern void rtw_recv_returnpacket(struct net_device *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); diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index b474dff..75cf613 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -116,7 +116,7 @@ extern struct iw_handler_def rtw_handlers_def; #endif extern NDIS_STATUS drv_query_info( - _nic_hdl MiniportAdapterContext, + struct net_device *MiniportAdapterContext, NDIS_OID Oid, void * InformationBuffer, u32 InformationBufferLength, @@ -125,7 +125,7 @@ extern NDIS_STATUS drv_query_info( ); extern NDIS_STATUS drv_set_info( - _nic_hdl MiniportAdapterContext, + struct net_device *MiniportAdapterContext, NDIS_OID Oid, void * InformationBuffer, u32 InformationBufferLength, diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h index 74aef2a..da235bd 100644 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -46,7 +46,7 @@ struct sta_xmit_priv; struct xmit_frame; struct xmit_buf; -extern int rtw_xmit_entry(struct sk_buff *pkt, _nic_hdl pnetdev); +extern int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); void rtw_os_xmit_schedule(_adapter *padapter); diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 9c1e6b9..040427f 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -576,7 +576,7 @@ void rtw_proc_remove_one(struct net_device *dev) } #endif -static uint loadparam( _adapter *padapter, _nic_hdl pnetdev) +static uint loadparam( _adapter *padapter, struct net_device *pnetdev) { uint status = _SUCCESS; diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c index a080b3c..7937c84 100644 --- a/os_dep/xmit_linux.c +++ b/os_dep/xmit_linux.c @@ -273,7 +273,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb) } -int rtw_xmit_entry(struct sk_buff *pkt, _nic_hdl pnetdev) +int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) { _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); struct xmit_priv *pxmitpriv = &padapter->xmitpriv;