diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
| commit | 4327974639c4d7f8688f564081956f8f79ef053c (patch) | |
| tree | 0ca57c56b2f76a39f476e8f22b0112aa566b3a86 /net/mac80211/ieee80211_i.h | |
| parent | c3e5127312f97482a6a09c0df602c726675eff5b (diff) | |
| parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 400c09bea63..9fab144cc9f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -345,6 +345,7 @@ struct ieee80211_work { struct { struct sk_buff *frame; u32 wait; + bool status; } offchan_tx; }; @@ -389,6 +390,7 @@ struct ieee80211_if_managed { unsigned long timers_running; /* used for quiesce/restart */ bool powersave; /* powersave requested for this iface */ + bool broken_ap; /* AP is broken -- turn off powersave */ enum ieee80211_smps_mode req_smps, /* requested smps mode */ ap_smps, /* smps mode AP thinks we're in */ driver_smps_mode; /* smps mode request */ |