aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Porsch <marco@cozybit.com>2013-01-07 10:04:51 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-01-16 16:44:04 -0500
commit9bdbf04db099c11bbbaea9dcea7465c508531fb8 (patch)
tree777ad3519262076879f8a5a7c068a2704808d8f5 /include
parenteac70c135def117849faa7cc8b7ccb941498085f (diff)
{cfg,nl,mac}80211: set beacon interval and DTIM period on mesh join
Move the default mesh beacon interval and DTIM period to cfg80211 and make them accessible to nl80211. This enables setting both values when joining an MBSS. Previously the DTIM parameter was not set by mac80211 so the driver's default value was used. Signed-off-by: Marco Porsch <marco@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
-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 3d8717a0d3b2..516aded3697f 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1036,6 +1036,8 @@ struct mesh_config {
1036 * @ie_len: length of vendor information elements 1036 * @ie_len: length of vendor information elements
1037 * @is_authenticated: this mesh requires authentication 1037 * @is_authenticated: this mesh requires authentication
1038 * @is_secure: this mesh uses security 1038 * @is_secure: this mesh uses security
1039 * @dtim_period: DTIM period to use
1040 * @beacon_interval: beacon interval to use
1039 * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a] 1041 * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
1040 * 1042 *
1041 * These parameters are fixed when the mesh is created. 1043 * These parameters are fixed when the mesh is created.
@@ -1051,6 +1053,8 @@ struct mesh_setup {
1051 u8 ie_len; 1053 u8 ie_len;
1052 bool is_authenticated; 1054 bool is_authenticated;
1053 bool is_secure; 1055 bool is_secure;
1056 u8 dtim_period;
1057 u16 beacon_interval;
1054 int mcast_rate[IEEE80211_NUM_BANDS]; 1058 int mcast_rate[IEEE80211_NUM_BANDS];
1055}; 1059};
1056 1060