diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 21:09:11 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 21:09:11 +0100 |
commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /net/mac80211/ieee80211_i.h | |
parent | ath9k: Fix TX poll routine (diff) | |
parent | ps3_gelic_wireless: Fix build failure due to missing WEXT_PRIV (diff) | |
download | linux-ea1e4b842049fcc4741096538114871a74859314.tar.xz linux-ea1e4b842049fcc4741096538114871a74859314.zip |
Merge 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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 6fb3f7181536..88b0ba6c7484 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -752,6 +752,7 @@ struct ieee80211_local { unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */ bool pspolling; + bool scan_ps_enabled; /* * PS can only be enabled when we have exactly one managed * interface (and monitors) in PS, this then points there. |