am 95e6324d: tc: Add support for HTB scheduling
Merge commit '95e6324d6688526258024064f7603e598a7e6159' into kraken
* commit '95e6324d6688526258024064f7603e598a7e6159':
tc: Add support for HTB scheduling
diff --git a/tc/Android.mk b/tc/Android.mk
index e405487..ecdaf88 100644
--- a/tc/Android.mk
+++ b/tc/Android.mk
@@ -3,7 +3,7 @@
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
diff --git a/tc/tc.c b/tc/tc.c
index 14ff85f..a261136 100644
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -46,6 +46,7 @@
#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 @@
#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 @@
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
