From patchwork Wed Oct 14 12:07:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jamal X-Patchwork-Id: 35958 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.176.167]) by ozlabs.org (Postfix) with ESMTP id EAB8CB7B6F for ; Wed, 14 Oct 2009 23:11:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759542AbZJNMLA (ORCPT ); Wed, 14 Oct 2009 08:11:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759519AbZJNMK7 (ORCPT ); Wed, 14 Oct 2009 08:10:59 -0400 Received: from mail-qy0-f172.google.com ([209.85.221.172]:39322 "EHLO mail-qy0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759324AbZJNMK7 (ORCPT ); Wed, 14 Oct 2009 08:10:59 -0400 Received: by qyk2 with SMTP id 2so9663120qyk.21 for ; Wed, 14 Oct 2009 05:10:23 -0700 (PDT) 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=yFFFtCPdjJu4+Ux4p387NFiSSSAG/s55l6wavvmNA2E=; b=NV45fQkwFlgWmh7A8vJXLEy/hpx1qW5RgvvX4m9FIEaGnbUw2C5cnEiKtBaB4HJCrK L77QcnSCiS3zcmi1AzP9C78UDUmwfyEt2Cg9Dc7JM2DPT+oJnY3NIKHSF7BzI8mRwtry st3E5SU8wA4aYxC6yk+v6wj1CWNKx6gE90UWw= 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=PqjlZdZoFKG7iab2MtSAhzSNvU3CnT6lAA6CLCkwFAnR+CNGiwRbiWXNRNH3aR1msz IvepSjViM6JjlXDQ+kVMzD1zJZcqLpo7jts+DR++Jpz3u4a0BoSFwP7xD/wlVoyLmsxn +A5dcGql1tDc6XT+cP1ViawE5nv/jpyxW/uSk= Received: by 10.224.52.200 with SMTP id j8mr6857253qag.326.1255522223047; Wed, 14 Oct 2009 05:10:23 -0700 (PDT) Received: from ?10.0.0.31? (CPE0030ab124d2f-CM001bd7a7f1a0.cpe.net.cable.rogers.com [99.240.75.67]) by mx.google.com with ESMTPS id 26sm1147657qwa.24.2009.10.14.05.10.21 (version=SSLv3 cipher=RC4-MD5); Wed, 14 Oct 2009 05:10:22 -0700 (PDT) Subject: [PATCH] iproute2: skbedit: Fix help message From: jamal Reply-To: hadi@cyberus.ca To: Alexander Duyck Cc: netdev@vger.kernel.org, Stephen Hemminger Date: Wed, 14 Oct 2009 08:07:21 -0400 Message-Id: <1255522041.21940.7.camel@dogo.mojatatu.com> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This fixes the help message on the skbedit action. Stephen, please apply if Alexander ACKs. cheers, jamal commit 28dd9c19a1fa618105238a3302f272e2aee7918a Author: Jamal Hadi Salim Date: Tue Oct 14 07:32:51 2009 -0400 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 Acked-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"); }