From patchwork Sat Aug 8 03:38:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 40087 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n783oTR5031188 for ; Sat, 8 Aug 2009 03:50:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933583AbZHHDu1 (ORCPT ); Fri, 7 Aug 2009 23:50:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933582AbZHHDu1 (ORCPT ); Fri, 7 Aug 2009 23:50:27 -0400 Received: from rv-out-0506.google.com ([209.85.198.236]:31937 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933568AbZHHDu0 (ORCPT ); Fri, 7 Aug 2009 23:50:26 -0400 Received: by rv-out-0506.google.com with SMTP id k40so287461rvb.5 for ; Fri, 07 Aug 2009 20:50:28 -0700 (PDT) Received: by 10.141.29.12 with SMTP id g12mr734710rvj.38.1249703427973; Fri, 07 Aug 2009 20:50:27 -0700 (PDT) Received: from localhost (adsl-71-156-104-53.dsl.pltn13.sbcglobal.net [71.156.104.53]) by mx.google.com with ESMTPS id b39sm10384879rvf.43.2009.08.07.20.50.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 07 Aug 2009 20:50:27 -0700 (PDT) From: Javier Cardona To: linux-wireless@vger.kernel.org Cc: Javier Cardona , andrey@cozybit.com, johannes@sipsolutions.net, linville@tuxdriver.com, devel@lists.open80211s.org Subject: [PATCH 7/8] mac80211: Assign a default mesh beaconing interval. Date: Fri, 7 Aug 2009 20:38:30 -0700 Message-Id: <1249702711-32737-8-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1249702711-32737-7-git-send-email-javier@cozybit.com> References: <> <1249702711-32737-1-git-send-email-javier@cozybit.com> <1249702711-32737-2-git-send-email-javier@cozybit.com> <1249702711-32737-3-git-send-email-javier@cozybit.com> <1249702711-32737-4-git-send-email-javier@cozybit.com> <1249702711-32737-5-git-send-email-javier@cozybit.com> <1249702711-32737-6-git-send-email-javier@cozybit.com> <1249702711-32737-7-git-send-email-javier@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Incidentally, this fixes mesh beaconing in mac80211_hwsim devices. Signed-off-by: Javier Cardona --- net/mac80211/mesh.c | 6 ++++-- net/mac80211/mesh.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 5202d7c..3b49d39 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -525,9 +525,11 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) struct ieee80211_local *local = sdata->local; ifmsh->housekeeping = true; - ieee80211_queue_work(&local->hw, &ifmsh->work); + queue_work(local->hw, &ifmsh->work); + sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL; ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON | - BSS_CHANGED_BEACON_ENABLED); + BSS_CHANGED_BEACON_ENABLED | + BSS_CHANGED_BEACON_INT); } void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index 6cb3db8..b6ea100 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -174,6 +174,7 @@ struct mesh_rmc { */ #define MESH_PATH_REFRESH_TIME 1000 #define MESH_MIN_DISCOVERY_TIMEOUT (2 * MESH_DIAM_TRAVERSAL_TIME) +#define MESH_DEFAULT_BEACON_INTERVAL 1000 /* in 1024 us units */ #define MESH_MAX_PREQ_RETRIES 4 #define MESH_PATH_EXPIRE (600 * HZ)