From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarek Poplawski Subject: [PATCH][IPROUTE] tc filters usage fixes Date: Mon, 18 Feb 2008 23:10:43 +0100 Message-ID: <20080218221043.GA6373@ami.dom.local> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org To: Stephen Hemminger Return-path: Received: from ug-out-1314.google.com ([66.249.92.170]:52476 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752935AbYBRWF7 (ORCPT ); Mon, 18 Feb 2008 17:05:59 -0500 Received: by ug-out-1314.google.com with SMTP id z38so430139ugc.16 for ; Mon, 18 Feb 2008 14:05:58 -0800 (PST) Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: A few usage description fixes of tc filters for some minimal consistency (FILTER_KIND because of QDISC_KIND). Signed-off-by: Jarek Poplawski --- tc/f_basic.c | 4 ++-- tc/f_rsvp.c | 2 +- tc/f_u32.c | 2 +- tc/tc_filter.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tc/f_basic.c b/tc/f_basic.c index ad41633..cf2650b 100644 --- a/tc/f_basic.c +++ b/tc/f_basic.c @@ -30,8 +30,8 @@ static void explain(void) fprintf(stderr, "Usage: ... basic [ match EMATCH_TREE ] [ police POLICE_SPEC ]\n"); fprintf(stderr, " [ action ACTION_SPEC ] [ classid CLASSID ]\n"); fprintf(stderr, "\n"); - fprintf(stderr, "Where: SELECTOR := SAMPLE SAMPLE ...\n"); - fprintf(stderr, " FILTERID := X:Y:Z\n"); + fprintf(stderr, "Where:\n"); + fprintf(stderr, " CLASSID := X:Y:Z\n"); fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n"); } diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c index 7e1e6d9..8f92e8f 100644 --- a/tc/f_rsvp.c +++ b/tc/f_rsvp.c @@ -33,7 +33,7 @@ static void explain(void) fprintf(stderr, "Where: GPI := { flowlabel NUMBER | spi/ah SPI | spi/esp SPI |\n"); fprintf(stderr, " u{8|16|32} NUMBER mask MASK at OFFSET}\n"); fprintf(stderr, " POLICE_SPEC := ... look at TBF\n"); - fprintf(stderr, " FILTERID := X:Y\n"); + fprintf(stderr, " CLASSID := X:Y\n"); fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n"); } diff --git a/tc/f_u32.c b/tc/f_u32.c index 9bc4bb5..957b1b1 100644 --- a/tc/f_u32.c +++ b/tc/f_u32.c @@ -38,7 +38,7 @@ static void explain(void) fprintf(stderr, "Where: SELECTOR := SAMPLE SAMPLE ...\n"); fprintf(stderr, " SAMPLE := { ip | ip6 | udp | tcp | icmp |" " u{32|16|8} | mark } SAMPLE_ARGS [divisor DIVISOR]\n"); - fprintf(stderr, " FILTERID := X:Y:Z\n"); + fprintf(stderr, " CLASSID := X:Y:Z\n"); fprintf(stderr, "\nNOTE: CLASSID is parsed at hexadecimal input.\n"); } diff --git a/tc/tc_filter.c b/tc/tc_filter.c index d70c656..eb74f89 100644 --- a/tc/tc_filter.c +++ b/tc/tc_filter.c @@ -33,12 +33,12 @@ static void usage(void) fprintf(stderr, "Usage: tc filter [ add | del | change | replace | show ] dev STRING\n"); fprintf(stderr, " [ pref PRIO ] protocol PROTO\n"); fprintf(stderr, " [ estimator INTERVAL TIME_CONSTANT ]\n"); - fprintf(stderr, " [ root | classid CLASSID ] [ handle FILTERID ]\n"); - fprintf(stderr, " [ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n"); + fprintf(stderr, " [ root | parent CLASSID ] [ handle FILTERID ]\n"); + fprintf(stderr, " [ [ FILTER_KIND ] [ help | OPTIONS ] ]\n"); fprintf(stderr, "\n"); fprintf(stderr, " tc filter show [ dev STRING ] [ root | parent CLASSID ]\n"); fprintf(stderr, "Where:\n"); - fprintf(stderr, "FILTER_TYPE := { rsvp | u32 | fw | route | etc. }\n"); + fprintf(stderr, "FILTER_KIND := { rsvp | u32 | fw | route | etc. }\n"); fprintf(stderr, "FILTERID := ... format depends on classifier, see there\n"); fprintf(stderr, "OPTIONS := ... try tc filter add help\n"); return;