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>

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 90949cfacd6d93b1993c3e6a8515491820c0896c..a46d4bb567a769122023bc99ccd74192dbf78a01 100644 (file)
--- 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 60e586c7d608072703fb0a863dfcd02f25761bb2..799ebaca2da7d2e3e39e9ce444270928edb3a9b5 100644 (file)
--- 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 e590ebd3a4529a1c31d7ba5f3b47e8cc9b040fb7..263a4b510ed339509c18aa4eab1295dea47c092f 100644 (file)
--- 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;
 }