diff options
| author |  David S. Miller <davem@davemloft.net>
| 2009-11-23 14:01:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2009-11-23 14:01:47 -0800 |
| commit | b5b5150977cdfb7173f4468ccd30f9b4a981b902 (patch) | |
| tree | 27d477910d630a027c0b447a58ae61b1c57dbca5 /net/mac80211/ieee80211_i.h | |
| parent | hso: fix soft-lockup (diff) | |
| parent | rfkill: fix miscdev ops (diff) | |
| download | linux-b5b5150977cdfb7173f4468ccd30f9b4a981b902.tar.gz linux-b5b5150977cdfb7173f4468ccd30f9b4a981b902.tar.bz2 linux-b5b5150977cdfb7173f4468ccd30f9b4a981b902.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 588005c84a6d..a910bf1f092f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -662,6 +662,14 @@ struct ieee80211_local { bool suspended; /* + * Resuming is true while suspended, but when we're reprogramming the + * hardware -- at that time it's allowed to use ieee80211_queue_work() + * again even though some other parts of the stack are still suspended + * and we still drop received frames to avoid waking the stack. + */ + bool resuming; + + /* * quiescing is true during the suspend process _only_ to * ease timer cancelling etc. */ |