]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
projects / thirdparty / iw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60b6c63)
iw: ap: add support for passing a proper chandef
authorShaul Triebitz <shaul.triebitz@intel.com>
Thu, 19 Jan 2017 11:51:31 +0000 (13:51 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 12 Dec 2017 11:01:03 +0000 (12:01 +0100)
While at it, also fix some minor things in the help.

Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
ap.c patch | blob | blame | history

diff --git a/ap.c b/ap.c
index bc16b77a42935f24f472c7d7e67f373da3125f4b..37fe06294e8584f1d74d412f6dd524fba7caa656 100644 (file)
--- a/ap.c
+++ b/ap.c
@@ -13,6 +13,8 @@ static int handle_start_ap(struct nl80211_state *state,
                           struct nl_msg *msg, int argc, char **argv,
                           enum id_input id)
 {
+       struct chandef chandef;
+       int res, parsed;
        char *end;
        int val, len;
        char buf[2304];
@@ -25,14 +27,15 @@ static int handle_start_ap(struct nl80211_state *state,
        argv++;
        argc--;
 
-       /* freq */
-       val = strtoul(argv[0], &end, 10);
-       if (*end != '\0')
-               return -EINVAL;
-
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, val);
-       argv++;
-       argc--;
+       /* chandef */
+       res = parse_freqchan(&chandef, false, argc, argv, &parsed);
+       if (res)
+               return res;
+       argc -= parsed;
+       argv += parsed;
+       res = put_chandef(msg, &chandef);
+       if (res)
+               return res;
 
        /* beacon interval */
        val = strtoul(argv[0], &end, 10);
@@ -107,8 +110,9 @@ static int handle_start_ap(struct nl80211_state *state,
 }
 COMMAND(ap, start, "",
        NL80211_CMD_NEW_BEACON, 0, CIB_NETDEV, handle_start_ap,
-       "<SSID> <freq in MHz> <beacon interval in TU> <DTIM period> <head>"
-       " <beacon head in hexadecimal> [<tail> <beacon tail in hexadecimal>]"
+       "<SSID> <control freq> [5|10|20|40|80|80+80|160] [<center1_freq> [<center2_freq>]]"
+       " <beacon interval in TU> <DTIM period> head"
+       " <beacon head in hexadecimal> [tail <beacon tail in hexadecimal>]"
        " [key0:abcde d:1:6162636465]\n");
 
 static int handle_stop_ap(struct nl80211_state *state,
Mirror git://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git