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

2014-05-27 13:47:27 -04:00
parent ef1b075c15 2c316e699f
commit 03c4444650
6 changed files with 43 additions and 18 deletions
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -317,6 +317,7 @@ struct ieee80211_roc_work {

 	bool started, abort, hw_begun, notified;
 	bool to_be_freed;
+	bool on_channel;

 	unsigned long hw_start_time;