From patchwork Thu Dec 3 13:27:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jamal X-Patchwork-Id: 40163 X-Patchwork-Delegate: shemminger@vyatta.com 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 25133B7B63 for ; Fri, 4 Dec 2009 00:27:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751953AbZLCN1X (ORCPT ); Thu, 3 Dec 2009 08:27:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751316AbZLCN1X (ORCPT ); Thu, 3 Dec 2009 08:27:23 -0500 Received: from mail-vw0-f192.google.com ([209.85.212.192]:41049 "EHLO mail-vw0-f192.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbZLCN1W (ORCPT ); Thu, 3 Dec 2009 08:27:22 -0500 Received: by vws30 with SMTP id 30so598181vws.33 for ; Thu, 03 Dec 2009 05:27:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:subject:from:reply-to :to:cc:content-type:date:message-id:mime-version:x-mailer; bh=nk8A6jIyeWIXclYiLR5xTW+VO/K+v+FmC8tWiSannuo=; b=EEDqJEM7LqRsZGQMOCjHnF1aBDVVkhchok7EAgT6APPvQd5sKWiAaafEnopdmeTXWa qXbfES81WinQROi4L3gAQKUIZMFQYwm48biluJiYnys9nAiA6LGhxuEGbSyseZCpe3BN NglX1nBlbHFVej4XNXNz2GIB/pC2umfZe9uPE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:subject:from:reply-to:to:cc:content-type:date:message-id :mime-version:x-mailer; b=i/KwxPsDEAK6PazYZEAe0vE7y2qEH1T6Wsu4zsf3b3vXcNEkD5OqIHLrkXV4Ez7Rr5 2b3rj32Y8YQnm0F6mCiViaXYcogYs41rwHhK/aEBUgmOUcJ1HZbdDePRUb+5r+yI0JHA AKXl2Xj7avitGSZ84HDrUWBoL7fTqIENEc0WI= Received: by 10.220.127.80 with SMTP id f16mr1801313vcs.107.1259846846156; Thu, 03 Dec 2009 05:27:26 -0800 (PST) Received: from ?10.0.0.26? (CPE0030ab124d2f-CM001bd7a7f1a0.cpe.net.cable.rogers.com [99.240.66.42]) by mx.google.com with ESMTPS id 20sm4317720vws.0.2009.12.03.05.27.25 (version=SSLv3 cipher=RC4-MD5); Thu, 03 Dec 2009 05:27:25 -0800 (PST) Subject: [PATCH 1/2] iproute2 skbedit: Fix help message From: jamal Reply-To: hadi@cyberus.ca To: Stephen Hemminger Cc: netdev@vger.kernel.org, Alexander Duyck Date: Thu, 03 Dec 2009 08:27:24 -0500 Message-Id: <1259846844.3766.36.camel@bigi> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently the help text for skbedit implies you can either pass queue mapping or priority. Truth is you can pass both cheers, jamal commit ca50bc332fc8f2cba0468fe133d41d78a0be7b71 Author: Jamal Hadi Salim Date: Thu Dec 3 08:14:11 2009 -0500 skbedit: Fix help message Currently the help text implies you can either pass queue mapping or priority. Truth is you can pass both Signed-off-by: Jamal Hadi Salim Signed-off-by: Alexander Duyck diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c index 9044353..ecb1f2d 100644 --- a/tc/m_skbedit.c +++ b/tc/m_skbedit.c @@ -31,8 +31,9 @@ static void explain(void) { - fprintf(stderr, "Usage: ... skbedit " - "queue_mapping QUEUE_MAPPING | priority PRIORITY \n" + fprintf(stderr, "Usage: ... skbedit <[QM] [PM]>\n" + "QM = queue_mapping QUEUE_MAPPING\n" + "PM = priority PRIORITY \n" "QUEUE_MAPPING = device transmit queue to use\n" "PRIORITY = classID to assign to priority field\n"); }