login
Header Space

 
 

[PATCH 5/7] Add linklayer parameter to CBQ.

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Stephen Hemminger <stephen.hemminger@...>
Cc: netdev <netdev@...>, David S. Miller <davem@...>, Patrick McHardy <kaber@...>
Date: Wednesday, April 9, 2008 - 5:04 pm

Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
---
  tc/q_cbq.c |   18 +++++++++++++++---
  1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tc/q_cbq.c b/tc/q_cbq.c
index e53d167..c99dc3b 100644
--- a/tc/q_cbq.c
+++ b/tc/q_cbq.c
@@ -32,7 +32,7 @@ static void explain_class(void)
  	fprintf(stderr, "               [ prio NUMBER ] [ cell BYTES ] [ ewma LOG ]\n");
  	fprintf(stderr, "               [ estimator INTERVAL TIME_CONSTANT ]\n");
  	fprintf(stderr, "               [ split CLASSID ] [ defmap MASK/CHANGE ]\n");
-	fprintf(stderr, "               [ overhead BYTES ]\n");
+	fprintf(stderr, "               [ overhead BYTES ] [ linklayer TYPE ]\n");
  }

  static void explain(void)
@@ -55,6 +55,7 @@ static int cbq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
  	__u32 rtab[256];
  	unsigned mpu=0, avpkt=0, allot=0;
  	unsigned short overhead=0;
+	unsigned int linklayer = LINKLAYER_ETHERNET; /* Assume ethernet */
  	int cell_log=-1;
  	int ewma_log=-1;
  	struct rtattr *tail;
@@ -120,6 +121,11 @@ static int cbq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
  			if (get_u16(&overhead, *argv, 10)) {
  				explain1("overhead"); return -1;
  			}
+		} else if (matches(*argv, "linklayer") == 0) {
+			NEXT_ARG();
+			if (get_linklayer(&linklayer, *argv)) {
+				explain1("linklayer"); return -1;
+			}
  		} else if (matches(*argv, "help") == 0) {
  			explain();
  			return -1;
@@ -146,7 +152,7 @@ static int cbq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl

  	r.mpu = mpu;
  	r.overhead = overhead;
-	if (tc_calc_rtable(&r, rtab, cell_log, allot) < 0) {
+	if (tc_calc_rtable(&r, rtab, cell_log, allot, linklayer) < 0) {
  		fprintf(stderr, "CBQ: failed to calculate rate table.\n");
  		return -1;
  	}
@@ -188,6 +194,7 @@ static int cbq_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
  	unsigned bndw = 0;
  	unsigned minburst=0, maxburst=0;
  	unsigned short overhead=0;
+	unsigned int linklayer = LINKLAYER_ETHERNET; /* Assume ethernet */
  	struct rtattr *tail;

  	memset(&r, 0, sizeof(r));
@@ -331,6 +338,11 @@ static int cbq_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
  			if (get_u16(&overhead, *argv, 10)) {
  				explain1("overhead"); return -1;
  			}
+		} else if (matches(*argv, "linklayer") == 0) {
+			NEXT_ARG();
+			if (get_linklayer(&linklayer, *argv)) {
+				explain1("linklayer"); return -1;
+			}
  		} else if (matches(*argv, "help") == 0) {
  			explain_class();
  			return -1;
@@ -351,7 +363,7 @@ static int cbq_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
  			wrr.allot = (lss.avpkt*3)/2;
  		r.mpu = mpu;
  		r.overhead = overhead;
-		if (tc_calc_rtable(&r, rtab, cell_log, pktsize) < 0) {
+		if (tc_calc_rtable(&r, rtab, cell_log, pktsize, linklayer) < 0) {
  			fprintf(stderr, "CBQ: failed to calculate rate table.\n");
  			return -1;
  		}
-- 
1.5.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/7] Final ADSL-optimizer patch series, Jesper Dangaard Brouer, (Wed Apr 9, 4:57 pm)
Re: [PATCH 0/7] Final ADSL-optimizer patch series, Stephen Hemminger, (Thu Apr 17, 1:10 pm)
Re: [PATCH 0/7] Final ADSL-optimizer patch series, David Miller, (Mon Apr 14, 1:40 am)
[PATCH 7/7] Add linklayer parameter to TBF., Jesper Dangaard Brouer, (Wed Apr 9, 5:07 pm)
[PATCH 6/7] Add linklayer parameter to HTB., Jesper Dangaard Brouer, (Wed Apr 9, 5:06 pm)
[PATCH 5/7] Add linklayer parameter to CBQ., Jesper Dangaard Brouer, (Wed Apr 9, 5:04 pm)
[PATCH 4/7] Add linklayer parameter to filter action police., Jesper Dangaard Brouer, (Wed Apr 9, 5:03 pm)
[PATCH 3/7] Parsing linklayer types., Jesper Dangaard Brouer, (Wed Apr 9, 5:02 pm)
[PATCH 2/7] ATM cell alignment., Jesper Dangaard Brouer, (Wed Apr 9, 5:01 pm)
Re: [PATCH 2/7] ATM cell alignment., Andy Furniss, (Sun Apr 13, 7:24 am)
Re: [PATCH 2/7] ATM cell alignment., Jesper Dangaard Brouer, (Mon Apr 14, 1:59 am)
Re: [PATCH 2/7] ATM cell alignment., Andy Furniss, (Tue Apr 15, 7:41 pm)
Re: [PATCH 2/7] ATM cell alignment., Patrick McHardy, (Fri Apr 11, 8:51 am)
Re: [PATCH 2/7] ATM cell alignment., Jesper Dangaard Brouer, (Fri Apr 11, 1:35 pm)
Re: [PATCH 2/7] ATM cell alignment., Patrick McHardy, (Sun Apr 13, 12:44 am)
Re: [PATCH 2/7] ATM cell alignment., Chas Williams (CONTRACTOR)..., (Thu Apr 10, 10:35 am)
Re: [PATCH 2/7] ATM cell alignment., Jesper Dangaard Brouer, (Fri Apr 11, 12:53 am)
Re: [PATCH 2/7] ATM cell alignment., Chas Williams (CONTRACTOR)..., (Fri Apr 11, 10:18 am)
[PATCH 1/7] In police, fix uninitialized "overhead" variable., Jesper Dangaard Brouer, (Wed Apr 9, 4:59 pm)
speck-geostationary