From patchwork Fri Feb 17 20:54:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 142009 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 785BB1007D5 for ; Sat, 18 Feb 2012 07:54:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754423Ab2BQUyr (ORCPT ); Fri, 17 Feb 2012 15:54:47 -0500 Received: from exchange.solarflare.com ([216.237.3.220]:15456 "EHLO ocex02.SolarFlarecom.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752642Ab2BQUyq (ORCPT ); Fri, 17 Feb 2012 15:54:46 -0500 Received: from [10.17.20.137] (10.17.20.137) by ocex02.SolarFlarecom.com (10.20.40.31) with Microsoft SMTP Server (TLS) id 14.1.355.2; Fri, 17 Feb 2012 12:54:45 -0800 Message-ID: <1329512084.2822.5.camel@bwh-desktop> Subject: [PATCH ethtool 1/4] Move '--flash' down the list of options From: Ben Hutchings To: CC: Date: Fri, 17 Feb 2012 20:54:44 +0000 In-Reply-To: <1329512042.2822.4.camel@bwh-desktop> References: <1329512042.2822.4.camel@bwh-desktop> Organization: Solarflare Communications X-Mailer: Evolution 3.2.3 (3.2.3-1.fc16) MIME-Version: 1.0 X-Originating-IP: [10.17.20.137] X-TM-AS-Product-Ver: SMEX-10.0.0.1412-6.800.1017-18714.005 X-TM-AS-Result: No--10.503300-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It doesn't make sense to to list it between the two RX NFC options in the online help. Signed-off-by: Ben Hutchings --- ethtool.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ethtool.c b/ethtool.c index d0cc7d4..1f496dd 100644 --- a/ethtool.c +++ b/ethtool.c @@ -3206,9 +3206,6 @@ static const struct option { "Show Rx network flow classification options", " [ rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|" "tcp6|udp6|ah6|esp6|sctp6 ]\n" }, - { "-f|--flash", 1, do_flash, - "Flash firmware image from the specified file to a region on the device", - " FILENAME [ REGION-NUMBER-TO-FLASH ]\n" }, { "-N|--config-nfc", 1, do_srxclass, "Configure Rx network flow classification options", " [ rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|" @@ -3218,6 +3215,9 @@ static const struct option { { "-X|--set-rxfh-indir", 1, do_srxfhindir, "Set Rx flow hash indirection", " equal N | weight W0 W1 ...\n" }, + { "-f|--flash", 1, do_flash, + "Flash firmware image from the specified file to a region on the device", + " FILENAME [ REGION-NUMBER-TO-FLASH ]\n" }, { "-U|--config-ntuple", 1, do_srxclsrule, "Configure Rx ntuple filters and actions", " [ delete %d ] |\n"