matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Overhead calculation is now done in the kernel. 

The only current user is HTB. HTB overhead argument is now passed on
to the kernel (in the struct tc_ratespec). Also correct the data
types.

Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
This commit is contained in:
Jesper Dangaard Brouer 2007-09-11 16:59:58 +02:00 committed by Stephen Hemminger
parent 77aa4d03a7
commit bccd014b86
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tc/q_htb.c
View File

@ -107,8 +107,9 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
__u32 rtab[256],ctab[256]; __u32 rtab[256],ctab[256];
unsigned buffer=0,cbuffer=0; unsigned buffer=0,cbuffer=0;
int cell_log=-1,ccell_log = -1; int cell_log=-1,ccell_log = -1;
unsigned mtu, mpu; unsigned mtu;
unsigned char mpu8 = 0, overhead = 0; unsigned short mpu = 0;
unsigned short overhead = 0;
struct rtattr *tail; struct rtattr *tail;
memset(&opt, 0, sizeof(opt)); mtu = 1600; /* eth packet len */ memset(&opt, 0, sizeof(opt)); mtu = 1600; /* eth packet len */
@ -127,12 +128,12 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
} }
} else if (matches(*argv, "mpu") == 0) { } else if (matches(*argv, "mpu") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_u8(&mpu8, *argv, 10)) { if (get_u16(&mpu, *argv, 10)) {
explain1("mpu"); return -1; explain1("mpu"); return -1;
} }
} else if (matches(*argv, "overhead") == 0) { } else if (matches(*argv, "overhead") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_u8(&overhead, *argv, 10)) { if (get_u16(&overhead, *argv, 10)) {
explain1("overhead"); return -1; explain1("overhead"); return -1;
} }
} else if (matches(*argv, "quantum") == 0) { } else if (matches(*argv, "quantum") == 0) {
@ -206,9 +207,11 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
if (!buffer) buffer = opt.rate.rate / get_hz() + mtu; if (!buffer) buffer = opt.rate.rate / get_hz() + mtu;
if (!cbuffer) cbuffer = opt.ceil.rate / get_hz() + mtu; if (!cbuffer) cbuffer = opt.ceil.rate / get_hz() + mtu;
/* encode overhead and mpu, 8 bits each, into lower 16 bits */ opt.ceil.overhead = overhead;
mpu = (unsigned)mpu8 | (unsigned)overhead << 8; opt.rate.overhead = overhead;
opt.ceil.mpu = mpu; opt.rate.mpu = mpu;
opt.ceil.mpu = mpu;
opt.rate.mpu = mpu;
if ((cell_log = tc_calc_rtable(opt.rate.rate, rtab, cell_log, mtu, mpu)) < 0) { if ((cell_log = tc_calc_rtable(opt.rate.rate, rtab, cell_log, mtu, mpu)) < 0) {
fprintf(stderr, "htb: failed to calculate rate table.\n"); fprintf(stderr, "htb: failed to calculate rate table.\n");

4
tc/tc_core.c
View File

@ -73,8 +73,6 @@ int tc_calc_rtable(unsigned bps, __u32 *rtab, int cell_log, unsigned mtu,
unsigned mpu) unsigned mpu)
{ {
int i; int i;
unsigned overhead = (mpu >> 8) & 0xFF;
mpu = mpu & 0xFF;
if (mtu == 0) if (mtu == 0)
mtu = 2047; mtu = 2047;
@ -86,8 +84,6 @@ int tc_calc_rtable(unsigned bps, __u32 *rtab, int cell_log, unsigned mtu,
} }
for (i=0; i<256; i++) { for (i=0; i<256; i++) {
unsigned sz = (i<<cell_log); unsigned sz = (i<<cell_log);
if (overhead)
sz += overhead;
if (sz < mpu) if (sz < mpu)
sz = mpu; sz = mpu;
rtab[i] = tc_calc_xmittime(bps, sz); rtab[i] = tc_calc_xmittime(bps, sz);