]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
iw: Configure basic rates when joining ibss network
authorTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Wed, 16 Jun 2010 06:22:16 +0000 (09:22 +0300)
committerJohannes Berg <johannes@sipsolutions.net>
Wed, 16 Jun 2010 07:17:34 +0000 (09:17 +0200)
This patch adds option to configure basic rates when joining ibss network.

Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
ibss.c

diff --git a/ibss.c b/ibss.c
index 4715ac81b65ec6819c7d16d70475138f12999e71..649143005cbee3e55bc543ec3371dcd660590c9a 100644 (file)
--- a/ibss.c
+++ b/ibss.c
@@ -18,6 +18,10 @@ static int join_ibss(struct nl80211_state *state,
 {
        char *end;
        unsigned char abssid[6];
+       unsigned char rates[NL80211_MAX_SUPP_RATES];
+       int n_rates = 0;
+       char *value = NULL, *sptr = NULL;
+       float rate;
 
        if (argc < 2)
                return 1;
@@ -49,6 +53,32 @@ static int join_ibss(struct nl80211_state *state,
                }
        }
 
+       /* 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--;
+       }
+
        if (!argc)
                return 0;
 
@@ -73,7 +103,9 @@ static int leave_ibss(struct nl80211_state *state,
 COMMAND(ibss, leave, NULL,
        NL80211_CMD_LEAVE_IBSS, 0, CIB_NETDEV, leave_ibss,
        "Leave the current IBSS cell.");
-COMMAND(ibss, join, "<SSID> <freq in MHz> [fixed-freq] [<fixed bssid>] [key d:0:abcde]",
+COMMAND(ibss, join,
+       "<SSID> <freq in MHz> [fixed-freq] [<fixed bssid>] "
+       "[basic-rates <rate in Mbps,rate2,...>] [key d:0:abcde]",
        NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,
        "Join the IBSS cell with the given SSID, if it doesn't exist create\n"
        "it on the given frequency. When fixed frequency is requested, don't\n"