diff options
| author | Ali Bahar <ali@internetdog.org> | 2011-09-04 03:14:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 17:00:30 -0700 |
| commit | 7bcd9ce6de23fc11c7cfe42b4d541922b77d6867 (patch) | |
| tree | 424b37c144ddf3e4c2a2cb373af4e98043e9f846 /drivers/staging/rtl8712 | |
| parent | 7c1f4203a2883c50e2d754b176fcfcd5be34549b (diff) | |
staging: r8712u: Merging Realtek's latest (v2.6.6). Removed os_free_netdev.
Replaced (Realtek's) os_free_netdev by (linux's own) free_netdev.
Signed-off-by: Ali Bahar <ali@internetDog.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/os_intfs.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c index 90949cfacd6..a46d4bb567a 100644 --- a/drivers/staging/rtl8712/os_intfs.c +++ b/drivers/staging/rtl8712/os_intfs.c @@ -348,7 +348,7 @@ u8 r8712_free_drv_sw(struct _adapter *padapter) _r8712_free_recv_priv(&padapter->recvpriv); mp871xdeinit(padapter); if (pnetdev) - os_free_netdev(pnetdev); + free_netdev(pnetdev); return _SUCCESS; } diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 60e586c7d60..799ebaca2da 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -78,11 +78,6 @@ struct __queue { spin_lock_init(&((pqueue)->lock)); \ } while (0) -static inline void os_free_netdev(struct net_device *dev) -{ - free_netdev(dev); -} - static inline struct list_head *get_next(struct list_head *list) { return list->next; diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index e590ebd3a45..263a4b510ed 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -599,7 +599,7 @@ error: if (padapter->dvobj_deinit != NULL) padapter->dvobj_deinit(padapter); if (pnetdev) - os_free_netdev(pnetdev); + free_netdev(pnetdev); return -ENODEV; } |