commit 8c52411012326a0e011d83dbb76ebeffc97b5d89
author Maciej Żenczykowski <maze@google.com> Sat Jan 12 17:49:13 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Fri Jan 25 16:13:25 2019 -0800
tree f447fa28e8fbdafde7def222890d12980d1d3b84
parent d6cdb1b581a3a8f63d3fb53b9daad6fa206a1077

iproute2: support more qdiscs

(probably not useful without rest of patch series)

Bug: 65674744
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia77fd91eeac800429830e21bb1b368cda329a51f

tc/tc.c

diff --git a/tc/tc.c b/tc/tc.c
index ac50879..3292416 100644
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -51,12 +51,6 @@
 static struct qdisc_util *qdisc_list;
 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;
-#endif
-
 static int print_noqopt(struct qdisc_util *qu, FILE *f,
 			struct rtattr *opt)
 {
@@ -111,18 +105,6 @@
 	char buf[256];
 	struct qdisc_util *q;
 
-#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 qdisc '%s'\n", str);
-		return NULL;
-	}
-#endif
 	for (q = qdisc_list; q; q = q->next)
 		if (strcmp(q->id, str) == 0)
 			return q;