diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-21 21:42:30 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-21 21:42:30 +0200 |
| commit | 7d2a47aab2a511c87a96238977e04e6378969d45 (patch) | |
| tree | e3765af6d4b292d8f3c013a5962324eab683a931 /net/mac80211/ieee80211_i.h | |
| parent | ndisc: Convert use of typedef ctl_table to struct ctl_table (diff) | |
| parent | mwifiex: channel switch handling for station (diff) | |
| download | linux-7d2a47aab2a511c87a96238977e04e6378969d45.tar.xz linux-7d2a47aab2a511c87a96238977e04e6378969d45.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/wireless/nl80211.c
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 923e1772e8f3..f97cd9d9105f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -366,7 +366,7 @@ struct ieee80211_mgd_assoc_data { u8 ssid_len; u8 supp_rates_len; bool wmm, uapsd; - bool have_beacon, need_beacon; + bool need_beacon; bool synced; bool timeout_started; @@ -404,6 +404,7 @@ struct ieee80211_if_managed { bool powersave; /* powersave requested for this iface */ bool broken_ap; /* AP is broken -- turn off powersave */ + bool have_beacon; u8 dtim_period; enum ieee80211_smps_mode req_smps, /* requested smps mode */ driver_smps_mode; /* smps mode request */ |