From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2013 00:56:26 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless-next/master'
X-Git-Tag: next-20130404~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27229365d6b71563523b658361ce2c6e9887ca3e;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
	drivers/nfc/microread/mei.c
	net/mac80211/sta_info.c
	net/wireless/core.h
---

27229365d6b71563523b658361ce2c6e9887ca3e
diff --cc net/mac80211/offchannel.c
index 950c95bec13d,b01eb7314ec6..cce795871ab1
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@@ -379,10 -370,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);