Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c19d86b authored by Ali Bahar's avatar Ali Bahar Committed by Greg Kroah-Hartman
Browse files

staging: r8712u: Merging Realtek's latest (v2.6.6). stop_drv_timers moved. 



stop_drv_timers() is now done in r871xu_dev_remove(), not netdev_close().

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 ac9bfc14

drivers/staging/rtl8712/os_intfs.c

+1 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void start_drv_timers(struct _adapter *padapter) 
	_set_timer(&padapter->mlmepriv.wdg_timer, 2000);

}



static void stop_drv_timers(struct _adapter *padapter)

void r8712_stop_drv_timers(struct _adapter *padapter)

{

	_cancel_timer_ex(&padapter->mlmepriv.assoc_timer);

	_cancel_timer_ex(&padapter->mlmepriv.sitesurveyctrl.
@@ -468,8 +468,6 @@ static int netdev_close(struct net_device *pnetdev) 
	r8712_free_assoc_resources(padapter);

	/*s2-4.*/

	r8712_free_network_queue(padapter);

	/*Stop driver mlme relation timer*/

	stop_drv_timers(padapter);

	/* The interface is no longer Up: */

	padapter->bup = false;

	return 0;

drivers/staging/rtl8712/usb_intf.c

+2 −0
Original line number Diff line number Diff line
@@ -622,6 +622,8 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) 
		}

		flush_scheduled_work();

		udelay(1);

		/*Stop driver mlme relation timer */

		r8712_stop_drv_timers(padapter);

		r871x_dev_unload(padapter);

		r8712_free_drv_sw(padapter);

	}

drivers/staging/rtl8712/usb_osintf.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ uint rtl8712_hal_deinit(struct _adapter *padapter); 
void rtl871x_intf_stop(struct _adapter *padapter);

void r871x_dev_unload(struct _adapter *padapter);

void r8712_stop_drv_threads(struct _adapter *padapter);

void r8712_stop_drv_timers(struct _adapter *padapter);

u8 r8712_init_drv_sw(struct _adapter *padapter);

u8 r8712_free_drv_sw(struct _adapter *padapter);

struct net_device *r8712_init_netdev(void);