diff options
| author | San Mehat <san@google.com> | 2010-04-30 10:13:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-30 10:13:53 -0700 |
| commit | fdef55a46eec6f9bef7b49bf2daca49828397a44 (patch) | |
| tree | 63d9e54f5ca093b6dad5262264988c0b3ece27ee | |
| parent | c688c922a1060eb0efc53d5ed4d4b59d65840c4a (diff) | |
| parent | 95e6324d6688526258024064f7603e598a7e6159 (diff) | |
| download | platform_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
| -rw-r--r-- | tc/Android.mk | 2 | ||||
| -rw-r--r-- | tc/tc.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tc/Android.mk b/tc/Android.mk index e405487e..ecdaf889 100644 --- a/tc/Android.mk +++ b/tc/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := tc.c tc_qdisc.c q_cbq.c tc_util.c tc_class.c tc_core.c m_action.c \ m_estimator.c tc_filter.c tc_monitor.c tc_stab.c tc_cbq.c \ - tc_estimator.c f_u32.c m_police.c q_ingress.c m_mirred.c + tc_estimator.c f_u32.c m_police.c q_ingress.c m_mirred.c q_htb.c LOCAL_MODULE := tc @@ -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 |