mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 20:21:57 +00:00
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>
This commit is contained in:
parent
7c1f4203a2
commit
7bcd9ce6de
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user