From patchwork Fri Jan 18 12:05:30 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Marco Porsch <marco@cozybit.com>
X-Patchwork-Id: 2001291
Return-Path: <linux-wireless-owner@vger.kernel.org>
X-Original-To: patchwork-linux-wireless@patchwork.kernel.org
Delivered-To: patchwork-process-083081@patchwork2.kernel.org
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by patchwork2.kernel.org (Postfix) with ESMTP id 33105DF280
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 18 Jan 2013 12:05:45 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751388Ab3ARMFn (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Fri, 18 Jan 2013 07:05:43 -0500
Received: from mail-bk0-f46.google.com ([209.85.214.46]:41219 "EHLO
	mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751116Ab3ARMFm (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Fri, 18 Jan 2013 07:05:42 -0500
Received: by mail-bk0-f46.google.com with SMTP id q16so1944178bkw.5
	for <linux-wireless@vger.kernel.org>;
	Fri, 18 Jan 2013 04:05:41 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=google.com; s=20120113;
	h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
	:references:x-gm-message-state;
	bh=67Fy5qg8IFia+1GGy/02CX7i6tC812NagxwmtYD5ixo=;
	b=lsvjgEK/AJNY9AENpemhLVfyIC/egMTdURZJ7ls25JpsfzCAP5U+KB6Xr0kai+96HV
	9vN0kTjwwKtz2twv1rXoYlGMDqoweSOi+lGmnOcrnBrN6ohmtHx5MioQmONbJ3gdFrf9
	ajhScokCBPo3kuHVkSkpLyeSh4juOD9i6A8P7MZDJMpHPJ43ckf0bsZm+0n6/aW9ogQT
	rgrAjg433KA0QN00Qi+y9X1n8/tExEduf5iE0hbTABWbp67ZsH30cJCCYVED90CN4BTT
	3ByuN7pVm/qopYWte6Nz08bmPPwU4fs5ASkCloLa+YPzAWsKeaptzd/7VH4+oUs4VfKy
	ae6Q==
X-Received: by 10.204.146.6 with SMTP id f6mr2380683bkv.69.1358510741114;
	Fri, 18 Jan 2013 04:05:41 -0800 (PST)
Received: from X220-marco.infotech.tu-chemnitz.de
	(perseus.infotech.tu-chemnitz.de. [134.109.4.8])
	by mx.google.com with ESMTPS id i20sm3572566bkw.5.2013.01.18.04.05.39
	(version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
	Fri, 18 Jan 2013 04:05:40 -0800 (PST)
From: Marco Porsch <marco@cozybit.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, devel@lists.open80211s.org,
	Marco Porsch <marco@cozybit.com>
Subject: [PATCH 1/3] iw: add beacon interval and DTIM period parameters to
	mesh join
Date: Fri, 18 Jan 2013 13:05:30 +0100
Message-Id: <1358510732-32767-2-git-send-email-marco@cozybit.com>
X-Mailer: git-send-email 1.7.9.5
In-Reply-To: <1358510732-32767-1-git-send-email-marco@cozybit.com>
References: <1358510732-32767-1-git-send-email-marco@cozybit.com>
X-Gm-Message-State: 
 ALoCoQniMqtSHEPFKMExSxhkWC07XqikZc06DM7AF6Rm1XdTJaliFriVVXxF2BzxkkF4aEjCrpYR
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Set the beacon interval and DTIM period with the mesh join
command:
iw <dev> mesh join <meshid> beacon-interval <time in TUs>
dtim-period <value>

Signed-off-by: Marco Porsch <marco@cozybit.com>
---
 mesh.c |   32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/mesh.c b/mesh.c
index 4fdad6a..958c2c0 100644
--- a/mesh.c
+++ b/mesh.c
@@ -383,6 +383,7 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb,
 {
 	struct nlattr *container;
 	float rate;
+	int bintval, dtim_period;
 	char *end;
 
 	if (argc < 1)
@@ -405,6 +406,32 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb,
 		argc--;
 	}
 
+	if (argc > 1 && strcmp(argv[0], "beacon-interval") == 0) {
+		argc--;
+		argv++;
+
+		bintval = strtoul(argv[0], &end, 10);
+		if (*end != '\0')
+			return 1;
+
+		NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, bintval);
+		argv++;
+		argc--;
+	}
+
+	if (argc > 1 && strcmp(argv[0], "dtim-period") == 0) {
+		argc--;
+		argv++;
+
+		dtim_period = strtoul(argv[0], &end, 10);
+		if (*end != '\0')
+			return 1;
+
+		NLA_PUT_U32(msg, NL80211_ATTR_DTIM_PERIOD, dtim_period);
+		argv++;
+		argc--;
+	}
+
 	container = nla_nest_start(msg, NL80211_ATTR_MESH_SETUP);
 	if (!container)
 		return -ENOBUFS;
@@ -431,8 +458,9 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb,
  nla_put_failure:
 	return -ENOBUFS;
 }
-COMMAND(mesh, join, "<mesh ID> [mcast-rate <rate in Mbps>] [vendor_sync on|off]"
-	" [<param>=<value>]*",
+COMMAND(mesh, join, "<mesh ID> [mcast-rate <rate in Mbps>]"
+	" [beacon-interval <time in TUs>] [dtim-period <value>]"
+	" [vendor_sync on|off] [<param>=<value>]*",
 	NL80211_CMD_JOIN_MESH, 0, CIB_NETDEV, join_mesh,
 	"Join a mesh with the given mesh ID with mcast-rate and mesh parameters.");