aboutsummaryrefslogtreecommitdiffstats
path: root/tc/tc.c
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2010-04-30 10:13:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-30 10:13:53 -0700
commitfdef55a46eec6f9bef7b49bf2daca49828397a44 (patch)
tree63d9e54f5ca093b6dad5262264988c0b3ece27ee /tc/tc.c
parentc688c922a1060eb0efc53d5ed4d4b59d65840c4a (diff)
parent95e6324d6688526258024064f7603e598a7e6159 (diff)
downloadplatform_external_iproute2-fdef55a46eec6f9bef7b49bf2daca49828397a44.tar.gz
platform_external_iproute2-fdef55a46eec6f9bef7b49bf2daca49828397a44.tar.bz2
platform_external_iproute2-fdef55a46eec6f9bef7b49bf2daca49828397a44.zip
am 95e6324d: tc: Add support for HTB scheduling
Merge commit '95e6324d6688526258024064f7603e598a7e6159' into kraken * commit '95e6324d6688526258024064f7603e598a7e6159': tc: Add support for HTB scheduling
Diffstat (limited to 'tc/tc.c')
-rw-r--r--tc/tc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tc/tc.c b/tc/tc.c
index 14ff85f7..a2611365 100644
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -46,6 +46,7 @@ static struct filter_util * filter_list;
#ifdef ANDROID
extern struct qdisc_util cbq_qdisc_util;
+extern struct qdisc_util htb_qdisc_util;
extern struct qdisc_util ingress_qdisc_util;
extern struct filter_util u32_filter_util;
#endif
@@ -106,10 +107,12 @@ struct qdisc_util *get_qdisc_kind(const char *str)
#ifdef ANDROID
if (!strcmp(str, "cbq"))
return &cbq_qdisc_util;
+ else if (!strcmp(str, "htb"))
+ return &htb_qdisc_util;
else if (!strcmp(str, "ingress"))
return &ingress_qdisc_util;
else {
- fprintf(stderr, "Android does not support '%s'\n", str);
+ fprintf(stderr, "Android does not support qdisc '%s'\n", str);
return NULL;
}
#endif
@@ -162,7 +165,7 @@ struct filter_util *get_filter_kind(const char *str)
if (!strcmp(str, "u32"))
return &u32_filter_util;
else {
- fprintf(stderr, "Android does not support '%s'\n", str);
+ fprintf(stderr, "Android does not support filter '%s'\n", str);
return NULL;
}
#endif