From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Sep 2010 05:27:33 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.37-rc1~147^2~485
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=e548833df83c3554229eff0672900bfe958b45fd

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c
---

e548833df83c3554229eff0672900bfe958b45fd
diff --cc net/mac80211/main.c
index a06b6ee63c0,ded5c3843e0..4935b843bcc
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -850,7 -732,12 +850,13 @@@ void ieee80211_unregister_hw(struct iee
  
  	rtnl_unlock();
  
+ 	/*
+ 	 * Now all work items will be gone, but the
+ 	 * timer might still be armed, so delete it
+ 	 */
+ 	del_timer_sync(&local->work_timer);
+ 
 +	cancel_work_sync(&local->restart_work);
  	cancel_work_sync(&local->reconfig_filter);
  
  	ieee80211_clear_tx_pending(local);