From patchwork Wed Nov 25 13:59:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 7699651 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 609E79F2EC for ; Wed, 25 Nov 2015 13:59:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91C4D208E5 for ; Wed, 25 Nov 2015 13:59:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72E8F20854 for ; Wed, 25 Nov 2015 13:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754325AbbKYN7g (ORCPT ); Wed, 25 Nov 2015 08:59:36 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:34115 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754313AbbKYN7f (ORCPT ); Wed, 25 Nov 2015 08:59:35 -0500 Received: by wmvv187 with SMTP id v187so258364103wmv.1 for ; Wed, 25 Nov 2015 05:59:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=++2QyWNeRfWPAjOOMdiiQHtIm10Jk7gDbEY3FnZBMDE=; b=DnZjS20KTgQuFocN8z5zKlA9Cl/t45uK7Vhs0AlwMWXeWgq7cBYSL4Nxw8/eIGq+Gs +vAQtpIvN7vK7Jl0LUtzJSFcZyzFQo4B1iezoBseMJW3+VgojdPimJ4nX8Kpf1bApMFn TIMKXsoma57B/d1nGAaSGr05raHoTnQvzu5knzGBw4AN9WUJY2z91lBlb7f4cGp2BRxz Yv4ghUR3IwQrmAL+93agg1l/ODEa6t/eQe9pdvr46zx9alHR0IAo7/eM30vyx3GukkRX O7o4f6GG7qrdoH9RH01Vd6F60C+8PM81CP+Stc0pqev2zh8Rfer8/BKl2ZkgZHeR0x8Y E2/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=++2QyWNeRfWPAjOOMdiiQHtIm10Jk7gDbEY3FnZBMDE=; b=Y0/WflxtJWCq2aQFLbJFCNuJegMwQhwIVQPa4jTr9A4k/dQrIxHjwdQMRIhY5RWTyv w9OeD2j1zIj9tdAEHnl7bvCIg6QqK0OTqcHXRDidhnwjnrsHBVeDV8UcF84UPs7VH1ig +WxAQSTeWInLbWadCbDMsMTQulDtTW1SgJj+ll+3XUBRqmcQnVknpLWfqT/gwlFv+aHK Xi2lK6cgclcn77nRJFiwSVplrwArK4WfApTvTqS1wzz4VclTNEH6rRLzH98QD9MTDKTY VALSD+y2U/mx5O5GyhgcptfxWG7C8EA2fBsnELT+rl74htbhxEHYy8fFGSxaCMNYiuzX FMsQ== X-Gm-Message-State: ALoCoQlXbbmk4i2cxoSLNYDnmpeebwnLtltB612/epDi/rRsLXOuQZfk48y9yTyyNA4iSqag6x/b X-Received: by 10.194.185.234 with SMTP id ff10mr42983028wjc.170.1448459974553; Wed, 25 Nov 2015 05:59:34 -0800 (PST) Received: from sven-desktop.home.narfation.org (x4d05aec6.dyn.telefonica.de. [77.5.174.198]) by smtp.gmail.com with ESMTPSA id hu2sm23313288wjb.21.2015.11.25.05.59.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2015 05:59:33 -0800 (PST) From: Sven Eckelmann To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Julian Calaby , Sven Eckelmann , Sven Eckelmann Subject: [PATCH v3 4/4] iw: print NOHT always as last in usage texts Date: Wed, 25 Nov 2015 14:59:18 +0100 Message-Id: <1448459959-23641-4-git-send-email-sven@open-mesh.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448459959-23641-1-git-send-email-sven@open-mesh.com> References: <1448459959-23641-1-git-send-email-sven@open-mesh.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sven Eckelmann --- v3: * split patch into two different patches (0001/0002) as request by Julian Calaby * 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 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, - " [HT20|HT40+|HT40-|NOHT|5MHz|10MHz|80MHz] [fixed-freq] [] [beacon-interval ]" + " [HT20|HT40+|HT40-|5MHz|10MHz|80MHz|NOHT] [fixed-freq] [] [beacon-interval ]" " [basic-rates ] [mcast-rate ] " "[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, " [[freq ]" +COMMAND(mesh, join, " [[freq ]" " [basic-rates ]], [mcast-rate ]" " [beacon-interval