UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

{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>
This commit is contained in:
Marco Porsch 2013-01-07 16:04:51 +01:00 committed by Johannes Berg
parent eac70c135d
commit 9bdbf04db0
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/cfg80211.h
View File

@ -1036,6 +1036,8 @@ struct mesh_config {
* @ie_len: length of vendor information elements * @ie_len: length of vendor information elements
* @is_authenticated: this mesh requires authentication * @is_authenticated: this mesh requires authentication
* @is_secure: this mesh uses security * @is_secure: this mesh uses security
* @dtim_period: DTIM period to use
* @beacon_interval: beacon interval to use
* @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a] * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
* *
* These parameters are fixed when the mesh is created. * These parameters are fixed when the mesh is created.
@ -1051,6 +1053,8 @@ struct mesh_setup {
u8 ie_len; u8 ie_len;
bool is_authenticated; bool is_authenticated;
bool is_secure; bool is_secure;
u8 dtim_period;
u16 beacon_interval;
int mcast_rate[IEEE80211_NUM_BANDS]; int mcast_rate[IEEE80211_NUM_BANDS];
}; };

3
net/mac80211/cfg.c
View File

@ -1666,6 +1666,9 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
memcpy(sdata->vif.bss_conf.mcast_rate, setup->mcast_rate, memcpy(sdata->vif.bss_conf.mcast_rate, setup->mcast_rate,
sizeof(setup->mcast_rate)); sizeof(setup->mcast_rate));
sdata->vif.bss_conf.beacon_int = setup->beacon_interval;
sdata->vif.bss_conf.dtim_period = setup->dtim_period;
return 0; return 0;
} }

1
net/mac80211/mesh.c
View File

@ -625,7 +625,6 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
ieee80211_queue_work(&local->hw, &sdata->work); ieee80211_queue_work(&local->hw, &sdata->work);
sdata->vif.bss_conf.ht_operation_mode = sdata->vif.bss_conf.ht_operation_mode =
ifmsh->mshcfg.ht_opmode; ifmsh->mshcfg.ht_opmode;
sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;
sdata->vif.bss_conf.enable_beacon = true; sdata->vif.bss_conf.enable_beacon = true;
sdata->vif.bss_conf.basic_rates = sdata->vif.bss_conf.basic_rates =
ieee80211_mandatory_rates(local, band); ieee80211_mandatory_rates(local, band);

2
net/mac80211/mesh.h
View File

@ -191,8 +191,6 @@ struct mesh_rmc {
#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ) #define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)
#define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ) #define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)
#define MESH_DEFAULT_BEACON_INTERVAL 1000 /* in 1024 us units */
#define MESH_PATH_EXPIRE (600 * HZ) #define MESH_PATH_EXPIRE (600 * HZ)
/* Default maximum number of plinks per interface */ /* Default maximum number of plinks per interface */

5
net/wireless/mesh.c
View File

@ -44,6 +44,9 @@
#define MESH_SYNC_NEIGHBOR_OFFSET_MAX 50 #define MESH_SYNC_NEIGHBOR_OFFSET_MAX 50
#define MESH_DEFAULT_BEACON_INTERVAL 1000 /* in 1024 us units (=TUs) */
#define MESH_DEFAULT_DTIM_PERIOD 2
const struct mesh_config default_mesh_config = { const struct mesh_config default_mesh_config = {
.dot11MeshRetryTimeout = MESH_RET_T, .dot11MeshRetryTimeout = MESH_RET_T,
.dot11MeshConfirmTimeout = MESH_CONF_T, .dot11MeshConfirmTimeout = MESH_CONF_T,
@ -79,6 +82,8 @@ const struct mesh_setup default_mesh_setup = {
.ie = NULL, .ie = NULL,
.ie_len = 0, .ie_len = 0,
.is_secure = false, .is_secure = false,
.beacon_interval = MESH_DEFAULT_BEACON_INTERVAL,
.dtim_period = MESH_DEFAULT_DTIM_PERIOD,
}; };
int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,

15
net/wireless/nl80211.c
View File

@ -6669,6 +6669,21 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
nla_get_u32(info->attrs[NL80211_ATTR_MCAST_RATE]))) nla_get_u32(info->attrs[NL80211_ATTR_MCAST_RATE])))
return -EINVAL; return -EINVAL;
if (info->attrs[NL80211_ATTR_BEACON_INTERVAL]) {
setup.beacon_interval =
nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
if (setup.beacon_interval < 10 ||
setup.beacon_interval > 10000)
return -EINVAL;
}
if (info->attrs[NL80211_ATTR_DTIM_PERIOD]) {
setup.dtim_period =
nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
if (setup.dtim_period < 1 || setup.dtim_period > 100)
return -EINVAL;
}
if (info->attrs[NL80211_ATTR_MESH_SETUP]) { if (info->attrs[NL80211_ATTR_MESH_SETUP]) {
/* parse additional setup parameters if given */ /* parse additional setup parameters if given */
err = nl80211_parse_mesh_setup(info, &setup); err = nl80211_parse_mesh_setup(info, &setup);