From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 10 Apr 2013 13:31:39 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.10-rc1~66^2~51^2^2~99
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6fe5468f452c0c40348ebd4e737758a842286ca8;p=linux-block.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/rt2x00/rt2x00pci.c
---

6fe5468f452c0c40348ebd4e737758a842286ca8
diff --cc net/mac80211/offchannel.c
index b01eb7314ec6,430bd254e496..cce795871ab1
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@@ -370,10 -379,10 +379,10 @@@ void ieee80211_sw_roc_work(struct work_
   finish:
  		list_del(&roc->list);
  		started = roc->started;
- 		ieee80211_roc_notify_destroy(roc);
+ 		ieee80211_roc_notify_destroy(roc, !roc->abort);
  
  		if (started) {
 -			drv_flush(local, false);
 +			ieee80211_flush_queues(local, NULL);
  
  			local->tmp_channel = NULL;
  			ieee80211_hw_config(local, 0);