From 302d3fb720d920ca15b7bfb979532cc0e5d7f20f Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 25 Sep 2006 17:08:40 -0700
Subject: [PATCH] More TC patches from Jamal.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
---
 tc/m_action.c  | 25 +++++++++++++------------
 tc/m_gact.c    |  8 ++++----
 tc/tc_class.c  |  2 +-
 tc/tc_filter.c |  2 +-
 tc/tc_qdisc.c  |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/tc/m_action.c b/tc/m_action.c
index e11d2f3b..3808a860 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -43,21 +43,22 @@ void act_usage(void)
 	 * with any action .so from the old days. But if someone really
 	 * does that, they would know how to fix this ..
 	 *
-	 */
+	*/
 	fprintf (stderr, "usage: tc actions <ACTSPECOP>*\n");
 	fprintf(stderr,
 		"Where: \tACTSPECOP := ACR | GD | FL\n"
-		"\tACR := add | change | replace <ACTSPEC>* \n"
-		"\tGD := get | delete | <ACTISPEC>*\n"
-		"\tFL := ls | list | flush | <ACTNAMESPEC>\n"
-		"\tACTNAMESPEC :=  action <ACTNAME>\n"
-		"\tACTISPEC := <ACTNAMESPEC> <INDEXSPEC>\n"
-		"\tACTSPEC := action <ACTDETAIL> [INDEXSPEC]\n"
-		"\tINDEXSPEC := index <32 bit indexvalue>\n"
-		"\tACTDETAIL := <ACTNAME> <ACTPARAMS>\n"
-		"\t\tExample ACTNAME is gact, mirred etc\n"
-		"\t\tEach action has its own parameters (ACTPARAMS)\n"
-		"\n");
+			"\tACR := add | change | replace <ACTSPEC>* \n"
+			"\tGD := get | delete | <ACTISPEC>*\n"
+			"\tFL := ls | list | flush | <ACTNAMESPEC>\n"
+			"\tACTNAMESPEC :=  action <ACTNAME>\n"
+			"\tACTISPEC := <ACTNAMESPEC> <INDEXSPEC>\n"
+			"\tACTSPEC := action <ACTDETAIL> [INDEXSPEC]\n"
+			"\tINDEXSPEC := index <32 bit indexvalue>\n"
+			"\tACTDETAIL := <ACTNAME> <ACTPARAMS>\n"
+			"\t\tExample ACTNAME is gact, mirred etc\n"
+			"\t\tEach action has its own parameters (ACTPARAMS)\n"
+			"\n");
+
 	exit(-1);
 }
 
diff --git a/tc/m_gact.c b/tc/m_gact.c
index ae75933b..cfbaf874 100644
--- a/tc/m_gact.c
+++ b/tc/m_gact.c
@@ -50,16 +50,17 @@ explain(void)
 		        "\tRANDTYPE := netrand | determ\n"
 			"\tVAL : = value not exceeding 10000\n"
 			"\tINDEX := index value used\n"
-		"\n");
+			"\n");
 #else
 	fprintf(stderr, "Usage: ... gact <ACTION> [INDEX]\n");
 	fprintf(stderr,
-	"Where: \tACTION := reclassify | drop | continue | pass \n"
+		"Where: \tACTION := reclassify | drop | continue | pass \n"
 		"\tINDEX := index value used\n"
 		"\n");
 #endif
 }
 
+
 static void
 usage(void)
 {
@@ -67,7 +68,6 @@ usage(void)
 	exit(-1);
 }
 
-
 int
 get_act(char ***argv_p)
 {
@@ -180,7 +180,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struc
 			argv++;
 			ok++;
 		} else if (matches(*argv, "help") == 0) {
-			usage();
+				usage();
 		}
 	}
 
diff --git a/tc/tc_class.c b/tc/tc_class.c
index 8d93b5a8..049584e1 100644
--- a/tc/tc_class.c
+++ b/tc/tc_class.c
@@ -29,7 +29,7 @@ static void usage(void);
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: tc class [ add | del | change | replace ] dev STRING\n");
+	fprintf(stderr, "Usage: tc class [ add | del | change | get ] dev STRING\n");
 	fprintf(stderr, "       [ classid CLASSID ] [ root | parent CLASSID ]\n");
 	fprintf(stderr, "       [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n");
 	fprintf(stderr, "\n");
diff --git a/tc/tc_filter.c b/tc/tc_filter.c
index f3319d55..3341b13f 100644
--- a/tc/tc_filter.c
+++ b/tc/tc_filter.c
@@ -32,7 +32,7 @@ static void usage(void);
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: tc filter [ add | del | change | replace ] dev STRING\n");
+	fprintf(stderr, "Usage: tc filter [ add | del | change | get ] 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");
diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
index 50b26497..76c78f2e 100644
--- a/tc/tc_qdisc.c
+++ b/tc/tc_qdisc.c
@@ -29,7 +29,7 @@ static int usage(void);
 
 static int usage(void)
 {
-	fprintf(stderr, "Usage: tc qdisc [ add | del | replace | change ] dev STRING\n");
+	fprintf(stderr, "Usage: tc qdisc [ add | del | replace | change | get ] dev STRING\n");
 	fprintf(stderr, "       [ handle QHANDLE ] [ root | ingress | parent CLASSID ]\n");
 	fprintf(stderr, "       [ estimator INTERVAL TIME_CONSTANT ]\n");
 	fprintf(stderr, "       [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n");