aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-05-09 12:41:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-12 14:10:47 -0400
commit56d1893d94bc06d0b1aa3a53f924ed02f9e207bf (patch)
tree90862ae6788cf267631bd9ddebf4bc450d0d2b26 /include/net
parent15cb309614f35df344b9f06a9ea9f077d1e449db (diff)
cfg80211: restrict AP beacon intervals
Multiple virtual AP interfaces can currently try to use different beacon intervals, but that just leads to problems since it won't actually be done that way by drivers. Return an error in this case to make sure it won't be done wrong. Also, ignore attempts to change the DTIM period or beacon interval during the lifetime of the BSS. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 1f1e221b6ce3..a46adb7a91b7 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1908,6 +1908,8 @@ struct cfg80211_cached_keys;
1908 * @mgmt_registrations_lock: lock for the list 1908 * @mgmt_registrations_lock: lock for the list
1909 * @mtx: mutex used to lock data in this struct 1909 * @mtx: mutex used to lock data in this struct
1910 * @cleanup_work: work struct used for cleanup that can't be done directly 1910 * @cleanup_work: work struct used for cleanup that can't be done directly
1911 * @beacon_interval: beacon interval used on this device for transmitting
1912 * beacons, 0 when not valid
1911 */ 1913 */
1912struct wireless_dev { 1914struct wireless_dev {
1913 struct wiphy *wiphy; 1915 struct wiphy *wiphy;
@@ -1948,6 +1950,8 @@ struct wireless_dev {
1948 bool ps; 1950 bool ps;
1949 int ps_timeout; 1951 int ps_timeout;
1950 1952
1953 int beacon_interval;
1954
1951#ifdef CONFIG_CFG80211_WEXT 1955#ifdef CONFIG_CFG80211_WEXT
1952 /* wext data */ 1956 /* wext data */
1953 struct { 1957 struct {