diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
| commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
| tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /net/mac80211/ieee80211_i.h | |
| parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e (diff) | |
| parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff) | |
Merge branch '3.15-fixes' into mips-for-linux-next
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 222c28b75315..f169b6ee94ee 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -317,6 +317,7 @@ struct ieee80211_roc_work { | |||
| 317 | 317 | ||
| 318 | bool started, abort, hw_begun, notified; | 318 | bool started, abort, hw_begun, notified; |
| 319 | bool to_be_freed; | 319 | bool to_be_freed; |
| 320 | bool on_channel; | ||
| 320 | 321 | ||
| 321 | unsigned long hw_start_time; | 322 | unsigned long hw_start_time; |
| 322 | 323 | ||