From 7bcd9ce6de23fc11c7cfe42b4d541922b77d6867 Mon Sep 17 00:00:00 2001 From: Ali Bahar Date: Sun, 4 Sep 2011 03:14:06 +0800 Subject: [PATCH] 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 Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/os_intfs.c | 2 +- drivers/staging/rtl8712/osdep_service.h | 5 ----- 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 90949cf..a46d4bb 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 60e586c..799ebac 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 e590ebd..263a4b5 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; } -- 2.7.4