Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2011-11-09 14:49:23 -05:00
parent ae2772b313 cc438fccd5
commit 5e819059a2
2403 changed files with 171017 additions and 209021 deletions
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@ -389,6 +389,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 */