Signed-off-by: Sven Eckelmann <sven@xxxxxxxxxxxxx> --- v3: * split patch into two different patches (0001/0002) as request by Julian Calaby <julian.calaby@xxxxxxxxx> * 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@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html