mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

staging: r8712u: Merging Realtek's latest (v2.6.6). Removed os_free_netdev.

Browse source 
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:
Ali Bahar 2011-09-04 03:14:06 +08:00 committed by Greg Kroah-Hartman
parent 7c1f4203a2
commit 7bcd9ce6de
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/rtl8712/os_intfs.c
View file

@ -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;
}

5
drivers/staging/rtl8712/osdep_service.h
View file

@ -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;

2
drivers/staging/rtl8712/usb_intf.c
View file

@ -599,7 +599,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
if (padapter->dvobj_deinit != NULL)
padapter->dvobj_deinit(padapter);
if (pnetdev)
os_free_netdev(pnetdev);
free_netdev(pnetdev);
return -ENODEV;
}