diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-27 19:47:27 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-27 19:47:27 +0200 |
commit | 03c4444650969431b3a5effde4995de767e3013a (patch) | |
tree | be95969287c7005d2e384d77c0ba2a071e13a260 /net/mac80211/ieee80211_i.h | |
parent | mwifiex: use 'const' qualifier for 2nd arg of mwifiex_tdls_add_ht_oper (diff) | |
parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
download | linux-03c4444650969431b3a5effde4995de767e3013a.tar.xz linux-03c4444650969431b3a5effde4995de767e3013a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ed2b817d5ece..ac9836e0aab3 100644 --- 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; |