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

Import patch hfsc-sc 

(Logical change 1.69)
This commit is contained in:
net[shemminger]!shemminger 2004-08-23 20:17:40 +00:00
parent eea4199ab6
commit b7de67dad5
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tc/q_hfsc.c
View File

@ -41,7 +41,7 @@ static void
explain_class(void) explain_class(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ... hfsc [ rt SC ] [ ls SC ] [ ul SC ]\n" "Usage: ... hfsc [ [ rt SC ] [ ls SC ] | [ sc SC ] ] [ ul SC ]\n"
"\n" "\n"
"SC := [ [ m1 BPS ] [ d SEC ] m2 BPS\n" "SC := [ [ m1 BPS ] [ d SEC ] m2 BPS\n"
"\n" "\n"
@ -166,6 +166,15 @@ hfsc_parse_class_opt(struct qdisc_util *qu, int argc, char **argv,
return -1; return -1;
} }
fsc_ok = 1; fsc_ok = 1;
} else if (matches(*argv, "sc") == 0) {
NEXT_ARG();
if (hfsc_get_sc(&argc, &argv, &rsc) < 0) {
explain1("sc");
return -1;
}
memcpy(&fsc, &rsc, sizeof(fsc));
rsc_ok = 1;
fsc_ok = 1;
} else if (matches(*argv, "ul") == 0) { } else if (matches(*argv, "ul") == 0) {
NEXT_ARG(); NEXT_ARG();
if (hfsc_get_sc(&argc, &argv, &usc) < 0) { if (hfsc_get_sc(&argc, &argv, &usc) < 0) {
@ -252,10 +261,16 @@ hfsc_print_class_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
usc = RTA_DATA(tb[TCA_HFSC_USC]); usc = RTA_DATA(tb[TCA_HFSC_USC]);
} }
if (rsc != NULL)
hfsc_print_sc(f, "rt", rsc); if (rsc != NULL && fsc != NULL &&
if (fsc != NULL) memcmp(rsc, fsc, sizeof(*rsc)) == 0)
hfsc_print_sc(f, "ls", fsc); hfsc_print_sc(f, "sc", rsc);
else {
if (rsc != NULL)
hfsc_print_sc(f, "rt", rsc);
if (fsc != NULL)
hfsc_print_sc(f, "ls", fsc);
}
if (usc != NULL) if (usc != NULL)
hfsc_print_sc(f, "ul", usc); hfsc_print_sc(f, "ul", usc);