Commit 7bcd9ce6 authored by Ali Bahar's avatar Ali Bahar Committed by Greg Kroah-Hartman

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: default avatarAli Bahar <ali@internetDog.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7c1f4203
...@@ -348,7 +348,7 @@ u8 r8712_free_drv_sw(struct _adapter *padapter) ...@@ -348,7 +348,7 @@ u8 r8712_free_drv_sw(struct _adapter *padapter)
_r8712_free_recv_priv(&padapter->recvpriv); _r8712_free_recv_priv(&padapter->recvpriv);
mp871xdeinit(padapter); mp871xdeinit(padapter);
if (pnetdev) if (pnetdev)
os_free_netdev(pnetdev); free_netdev(pnetdev);
return _SUCCESS; return _SUCCESS;
} }
......
...@@ -78,11 +78,6 @@ struct __queue { ...@@ -78,11 +78,6 @@ struct __queue {
spin_lock_init(&((pqueue)->lock)); \ spin_lock_init(&((pqueue)->lock)); \
} while (0) } 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) static inline struct list_head *get_next(struct list_head *list)
{ {
return list->next; return list->next;
......
...@@ -599,7 +599,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, ...@@ -599,7 +599,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
if (padapter->dvobj_deinit != NULL) if (padapter->dvobj_deinit != NULL)
padapter->dvobj_deinit(padapter); padapter->dvobj_deinit(padapter);
if (pnetdev) if (pnetdev)
os_free_netdev(pnetdev); free_netdev(pnetdev);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment