This patch adds option to configure basic rates during mesh join. basic-rates has to be passed along with "freq" attribute. For instance:
iw $MESH_IFACE mesh join mymeshid freq 2437 basic-rates 5.5,11 Signed-off-by: Ashok Nagarajan <[email protected]> --- mesh.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/mesh.c b/mesh.c index ec202c9..f7c4c35 100644 --- a/mesh.c +++ b/mesh.c @@ -431,8 +431,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; static const struct { const char *name; unsigned int val; @@ -482,6 +483,34 @@ 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--; @@ -547,13 +576,14 @@ static int join_mesh(struct nl80211_state *state, struct nl_cb *cb, nla_put_failure: return -ENOBUFS; } -COMMAND(mesh, join, "<mesh ID> [freq in MHz] [HT20|HT40+|HT40-|NOHT]" - " [mcast-rate <rate in Mbps>]" +COMMAND(mesh, join, "<mesh ID> [freq in MHz [HT20|HT40+|HT40-|NOHT]" + " [basic-rates <rate in Mbps,rate2,...>]], [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 freq, mcast-rate, " - "and mesh parameters."); + "Join a mesh with the given mesh ID with frequency, basic-rates,\n" + "mcast-rate and mesh parameters. basic-rates are be applied only if\n" + "frequency is provided."); static int leave_mesh(struct nl80211_state *state, struct nl_cb *cb, struct nl_msg *msg, int argc, char **argv, -- 1.7.5.4 _______________________________________________ Devel mailing list [email protected] http://lists.open80211s.org/cgi-bin/mailman/listinfo/devel
