Remove struct net_device wrapper

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>

diff --git a/include/drv_types.h b/include/drv_types.h
index a9ef8ac..a43b152 100644 (file)
--- a/include/drv_types.h
+++ b/include/drv_types.h
@@ -414,11 +414,11 @@ struct _ADAPTER{
        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_intf.h b/include/osdep_intf.h
index f436ac6..92c827c 100644 (file)
--- a/include/osdep_intf.h
+++ b/include/osdep_intf.h
@@ -115,6 +115,6 @@ void rtw_drv_if2_stop(_adapter *if2);
 #endif
 
 int rtw_drv_register_netdev(_adapter *padapter);
-void rtw_ndev_destructor(_nic_hdl ndev);
+void rtw_ndev_destructor(struct net_device *ndev);
 
 #endif //_OSDEP_INTF_H_

diff --git a/include/osdep_service.h b/include/osdep_service.h
index c4b4916..e4d3dcd 100644 (file)
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -91,7 +91,6 @@ struct        __queue {
 };
 
 typedef struct __queue _queue;
-typedef        struct  net_device * _nic_hdl;
 
 #define thread_exit() complete_and_exit(NULL, 0)
 
@@ -104,7 +103,8 @@ static inline struct list_head      *get_list_head(_queue   *queue)
 }
 
 
-static inline void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx)
+static inline void _init_timer(_timer *ptimer, struct net_device *nic_hdl,
+                              void *pfunc, void* cntx)
 {
        //setup_timer(ptimer, pfunc,(u32)cntx);
        ptimer->function = pfunc;
@@ -257,9 +257,6 @@ extern void rtw_mdelay_os(int ms);
 extern void    rtw_udelay_os(int us);
 #endif
 
-extern void rtw_yield_os(void);
-
-
 static inline unsigned char _cancel_timer_ex(_timer *ptimer)
 {
        return del_timer_sync(ptimer);

diff --git a/include/recv_osdep.h b/include/recv_osdep.h
index ea24678..e6b1f77 100644 (file)
--- a/include/recv_osdep.h
+++ b/include/recv_osdep.h
@@ -31,7 +31,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/xmit_osdep.h b/include/xmit_osdep.h
index ffc8994..51f9d76 100644 (file)
--- a/include/xmit_osdep.h
+++ b/include/xmit_osdep.h
@@ -42,7 +42,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 e70310c..cc68e70 100644 (file)
--- a/os_dep/os_intfs.c
+++ b/os_dep/os_intfs.c
@@ -270,7 +270,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")
 module_param_named(debug, rtw_debug, int, 0444);
 MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
 
-static uint loadparam(PADAPTER padapter, _nic_hdl pnetdev);
+static uint loadparam(PADAPTER padapter, struct net_device * pnetdev);
 int _netdev_open(struct net_device *pnetdev);
 int netdev_open (struct net_device *pnetdev);
 static int netdev_close (struct net_device *pnetdev);
@@ -708,7 +708,7 @@ void rtw_proc_remove_one(struct net_device *dev)
 #endif
 #endif //ifndef create_proc_entry
 
-uint loadparam( _adapter *padapter,  _nic_hdl  pnetdev)
+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 c986912..875ac85 100644 (file)
--- a/os_dep/xmit_linux.c
+++ b/os_dep/xmit_linux.c
@@ -342,7 +342,7 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
 #endif // CONFIG_TX_MCAST2UNI
 
 
-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;