From: Sven Eckelmann <sven@open-mesh.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org,
Julian Calaby <julian.calaby@gmail.com>,
Sven Eckelmann <sven@open-mesh.com>,
Sven Eckelmann <sven@narfation.org>
Subject: [PATCH v3 4/4] iw: print NOHT always as last in usage texts
Date: Wed, 25 Nov 2015 14:59:18 +0100 [thread overview]
Message-ID: <1448459959-23641-4-git-send-email-sven@open-mesh.com> (raw)
In-Reply-To: <1448459959-23641-1-git-send-email-sven@open-mesh.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v3:
* split patch into two different patches (0001/0002) as request by
Julian Calaby <julian.calaby@gmail.com>
* change join_ocb to also use get_cf1
* move NOHT to the last entry in the mesh/ibss join usage texts as
requested by Julian Calaby <julian.calaby@gmail.com>
v2:
* rebase from v4.3-ish version to current master
ibss.c | 2 +-
mesh.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ibss.c b/ibss.c
index a761794..58c3bcd 100644
--- a/ibss.c
+++ b/ibss.c
@@ -192,7 +192,7 @@ 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> [HT20|HT40+|HT40-|NOHT|5MHz|10MHz|80MHz] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
+ "<SSID> <freq in MHz> [HT20|HT40+|HT40-|5MHz|10MHz|80MHz|NOHT] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
" [basic-rates <rate in Mbps,rate2,...>] [mcast-rate <rate in Mbps>] "
"[key d:0:abcde]",
NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,
diff --git a/mesh.c b/mesh.c
index d674d61..76b9fa8 100644
--- a/mesh.c
+++ b/mesh.c
@@ -608,7 +608,7 @@ static int join_mesh(struct nl80211_state *state,
nla_put_failure:
return -ENOBUFS;
}
-COMMAND(mesh, join, "<mesh ID> [[freq <freq in MHz> <HT20|HT40+|HT40-|NOHT|80MHz>]"
+COMMAND(mesh, join, "<mesh ID> [[freq <freq in MHz> <HT20|HT40+|HT40-|80MHz|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>]*",
--
2.6.2
prev parent reply other threads:[~2015-11-25 13:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 13:59 [PATCH v3 1/4] iw: prepare get_cf1 for use in join_* functions Sven Eckelmann
2015-11-25 13:59 ` [PATCH v3 2/4] iw: add VHT80 support for 802.11s Sven Eckelmann
2015-11-25 13:59 ` [PATCH v3 3/4] iw: use get_cf1 and struct chanmode for ocb Sven Eckelmann
2015-11-25 13:59 ` Sven Eckelmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448459959-23641-4-git-send-email-sven@open-mesh.com \
--to=sven@open-mesh.com \
--cc=johannes@sipsolutions.net \
--cc=julian.calaby@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=sven@narfation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).