Return-path: Received: from mail-pa0-f41.google.com ([209.85.220.41]:56544 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbaITGlF (ORCPT ); Sat, 20 Sep 2014 02:41:05 -0400 Received: by mail-pa0-f41.google.com with SMTP id ey11so1626918pad.28 for ; Fri, 19 Sep 2014 23:41:04 -0700 (PDT) From: Chun-Yeow Yeoh To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, devel@lists.open80211s.org, Chun-Yeow Yeoh , Ashok Nagarajan Subject: [PATCH v3 2/2] iw: Allow basic rates to be configured when joining mesh Date: Sat, 20 Sep 2014 14:40:44 +0800 Message-Id: <1411195244-9130-2-git-send-email-yeohchunyeow@gmail.com> (sfid-20140920_084110_810094_05534B42) In-Reply-To: <1411195244-9130-1-git-send-email-yeohchunyeow@gmail.com> References: <1411195244-9130-1-git-send-email-yeohchunyeow@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: This patch adds option to configure basic rates during mesh join. Signed-off-by: Ashok Nagarajan Signed-off-by: Chun-Yeow Yeoh v2: minor change for upstream v3: fix typo error (Colleen) --- mesh.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/mesh.c b/mesh.c index 69c54cc..23cba2e 100644 --- a/mesh.c +++ b/mesh.c @@ -438,8 +438,9 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb, { struct nlattr *container; float rate; - int bintval, dtim_period, i; - char *end; + unsigned char rates[NL80211_MAX_SUPP_RATES]; + int bintval, dtim_period, i, n_rates = 0; + char *end, *value = NULL, *sptr = NULL; unsigned long freq = 0; static const struct { const char *name; @@ -510,6 +511,32 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb, } } + /* basic rates */ + if (argc > 1 && strcmp(argv[0], "basic-rates") == 0) { + argv++; + argc--; + + value = strtok_r(argv[0], ",", &sptr); + + while (value && n_rates < NL80211_MAX_SUPP_RATES) { + rate = strtod(value, &end); + rates[n_rates] = rate * 2; + + /* filter out suspicious values */ + if (*end != '\0' || !rates[n_rates] || + rate*2 != rates[n_rates]) + return 1; + + n_rates++; + value = strtok_r(NULL, ",", &sptr); + } + + NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, n_rates, rates); + argv++; + argc--; + } + + /* multicast rate */ if (argc > 1 && strcmp(argv[0], "mcast-rate") == 0) { argv++; argc--; @@ -575,13 +602,14 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb, nla_put_failure: return -ENOBUFS; } -COMMAND(mesh, join, " [freq in MHz] [HT20|HT40+|HT40-|NOHT]" - " [mcast-rate ]" +COMMAND(mesh, join, " [freq in MHz [HT20|HT40+|HT40-|NOHT]" + " [basic-rates ]], [mcast-rate ]" " [beacon-interval