From patchwork Fri Dec 7 22:13:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Porsch X-Patchwork-Id: 1851901 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 01FB83FC71 for ; Fri, 7 Dec 2012 22:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424715Ab2LGWOm (ORCPT ); Fri, 7 Dec 2012 17:14:42 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:58397 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424708Ab2LGWOi (ORCPT ); Fri, 7 Dec 2012 17:14:38 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so648555pbc.19 for ; Fri, 07 Dec 2012 14:14:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=VbKEeTqAeGFux6hjvCFVI3HpKzKP21S1UgJPFalVSNg=; b=Uz7z9hn/O/FeVe+0/2Q8B+6nYsfaMz8JwzOw1pVHhfIbkCHNBqNZIg5hDGc1B43C14 6lDYIozAtI0yf/DCfod8l/mg0JdKJXv9ZOd3Jk8IRtap2LygN3sKNfl4mCJdj1/Uq50C lC2kvzghAKA9nSfwofBfvhF97qb9WRamV0/VEh+Wksh+QNShO+UWJYm5jMM9V/qiz7IC 4NsZdEh1LC8tVRy75vB9EiqregUoOdKGF1KnH/GLGpDbEfhmLmxbSBimJxXEB5RG2RZx /pgo4PPOkfhHxibty/pPNhrDncYnls5GIDsGPnVxyIDMISPY0NnzT7g5EYQDF2cc8LEr mIMw== Received: by 10.68.230.200 with SMTP id ta8mr19348593pbc.13.1354918478630; Fri, 07 Dec 2012 14:14:38 -0800 (PST) Received: from X220-marco.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPS id i3sm7243695pav.18.2012.12.07.14.14.37 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Dec 2012 14:14:38 -0800 (PST) From: Marco Porsch To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, devel@lists.open80211s.org, Marco Porsch Subject: [RFCv3 1/5] {nl, cfg, mac}80211: set beacon interval and DTIM period on mesh join Date: Fri, 7 Dec 2012 14:13:59 -0800 Message-Id: <1354918443-3076-2-git-send-email-marco@cozybit.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354918443-3076-1-git-send-email-marco@cozybit.com> References: <1354918443-3076-1-git-send-email-marco@cozybit.com> X-Gm-Message-State: ALoCoQk+fPdl0Y5mMhjV0acyFoovKILgFpHilIq2G1VnngvaEsFz5BM6wYFiCRlYGPDTCrKcI77q Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Move the default mesh beacon interval and DTIM period to cfg80211 and make it 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 --- include/net/cfg80211.h | 4 ++++ net/mac80211/cfg.c | 3 +++ net/mac80211/mesh.c | 1 - net/mac80211/mesh.h | 2 -- net/wireless/mesh.c | 5 +++++ net/wireless/nl80211.c | 14 ++++++++++++++ 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index e78db2c..a31e893 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1009,6 +1009,8 @@ struct mesh_config { * @ie_len: length of vendor information elements * @is_authenticated: this mesh requires authentication * @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] * * These parameters are fixed when the mesh is created. @@ -1024,6 +1026,8 @@ struct mesh_setup { u8 ie_len; bool is_authenticated; bool is_secure; + u8 dtim_period; + u16 beacon_interval; int mcast_rate[IEEE80211_NUM_BANDS]; }; diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 4965aa6..7227477 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1604,6 +1604,9 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh, memcpy(sdata->vif.bss_conf.mcast_rate, 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; } diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 1bf03f9..a4b332c 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -624,7 +624,6 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) ieee80211_queue_work(&local->hw, &sdata->work); sdata->vif.bss_conf.ht_operation_mode = ifmsh->mshcfg.ht_opmode; - sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL; sdata->vif.bss_conf.basic_rates = ieee80211_mandatory_rates(sdata->local, ieee80211_get_sdata_band(sdata)); diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index 7c9215f..7f3a78f 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -191,8 +191,6 @@ struct mesh_rmc { #define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ) #define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ) -#define MESH_DEFAULT_BEACON_INTERVAL 1000 /* in 1024 us units */ - #define MESH_PATH_EXPIRE (600 * HZ) /* Default maximum number of plinks per interface */ diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index 3ee5a72..6d8ce90 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -44,6 +44,9 @@ #define MESH_SYNC_NEIGHBOR_OFFSET_MAX 50 +#define MESH_DEFAULT_BEACON_INTERVAL 1000 /* in 1024 us units (=TUs) */ +#define MESH_DEFAULT_DTIM_PERIOD 1 + const struct mesh_config default_mesh_config = { .dot11MeshRetryTimeout = MESH_RET_T, .dot11MeshConfirmTimeout = MESH_CONF_T, @@ -79,6 +82,8 @@ const struct mesh_setup default_mesh_setup = { .ie = NULL, .ie_len = 0, .is_secure = false, + .beacon_interval = MESH_DEFAULT_BEACON_INTERVAL, + .dtim_period = MESH_DEFAULT_DTIM_PERIOD, }; int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2d08d9d..dd179ad 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6652,6 +6652,20 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) nla_get_u32(info->attrs[NL80211_ATTR_MCAST_RATE]))) 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]) { /* parse additional setup parameters if given */ err = nl80211_parse_mesh_setup(info, &setup);