rename sch -> qdisc

24 files changed, 35 insertions, 34 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 8824dfe..e7f1206 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -33,15 +33,15 @@ nobase_include_HEADERS = \
 	netlink/route/cls/u32.h \
 	netlink/route/link/info-api.h \
 	netlink/route/link/vlan.h \
-	netlink/route/sch/cbq.h \
-	netlink/route/sch/dsmark.h \
-	netlink/route/sch/fifo.h \
-	netlink/route/sch/htb.h \
-	netlink/route/sch/netem.h \
-	netlink/route/sch/prio.h \
-	netlink/route/sch/red.h \
-	netlink/route/sch/sfq.h \
-	netlink/route/sch/tbf.h \
+	netlink/route/qdisc/cbq.h \
+	netlink/route/qdisc/dsmark.h \
+	netlink/route/qdisc/fifo.h \
+	netlink/route/qdisc/htb.h \
+	netlink/route/qdisc/netem.h \
+	netlink/route/qdisc/prio.h \
+	netlink/route/qdisc/red.h \
+	netlink/route/qdisc/sfq.h \
+	netlink/route/qdisc/tbf.h \
 	netlink/route/addr.h \
 	netlink/route/class.h \
 	netlink/route/classifier.h \
diff --git a/include/netlink/route/sch/cbq.h b/include/netlink/route/qdisc/cbq.h
index 3dbdd2d..3dbdd2d 100644
--- a/include/netlink/route/sch/cbq.h
+++ b/include/netlink/route/qdisc/cbq.h
diff --git a/include/netlink/route/sch/dsmark.h b/include/netlink/route/qdisc/dsmark.h
index de65496..de65496 100644
--- a/include/netlink/route/sch/dsmark.h
+++ b/include/netlink/route/qdisc/dsmark.h
diff --git a/include/netlink/route/sch/fifo.h b/include/netlink/route/qdisc/fifo.h
index c18dd79..c18dd79 100644
--- a/include/netlink/route/sch/fifo.h
+++ b/include/netlink/route/qdisc/fifo.h
diff --git a/include/netlink/route/sch/htb.h b/include/netlink/route/qdisc/htb.h
index 9061b9b..9061b9b 100644
--- a/include/netlink/route/sch/htb.h
+++ b/include/netlink/route/qdisc/htb.h
diff --git a/include/netlink/route/sch/netem.h b/include/netlink/route/qdisc/netem.h
index ce56ee7..ce56ee7 100644
--- a/include/netlink/route/sch/netem.h
+++ b/include/netlink/route/qdisc/netem.h
diff --git a/include/netlink/route/sch/prio.h b/include/netlink/route/qdisc/prio.h
index f6fdc86..f6fdc86 100644
--- a/include/netlink/route/sch/prio.h
+++ b/include/netlink/route/qdisc/prio.h
diff --git a/include/netlink/route/sch/red.h b/include/netlink/route/qdisc/red.h
index a4e8642..a4e8642 100644
--- a/include/netlink/route/sch/red.h
+++ b/include/netlink/route/qdisc/red.h
diff --git a/include/netlink/route/sch/sfq.h b/include/netlink/route/qdisc/sfq.h
index 7cc0b3e..7cc0b3e 100644
--- a/include/netlink/route/sch/sfq.h
+++ b/include/netlink/route/qdisc/sfq.h
diff --git a/include/netlink/route/sch/tbf.h b/include/netlink/route/qdisc/tbf.h
index 8a2144a..8a2144a 100644
--- a/include/netlink/route/sch/tbf.h
+++ b/include/netlink/route/qdisc/tbf.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 25a7ac5..ccedf43 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -60,9 +60,10 @@ libnl_route_la_SOURCES = \
 	route/link/api.c route/link/vlan.c \
 	route/link/bridge.c route/link/inet6.c route/link/inet.c \
 	\
-	route/sch/blackhole.c route/sch/cbq.c route/sch/dsmark.c \
-	route/sch/fifo.c route/sch/htb.c route/sch/netem.c route/sch/prio.c \
-	route/sch/red.c route/sch/sfq.c route/sch/tbf.c \
+	route/qdisc/blackhole.c route/qdisc/cbq.c route/qdisc/dsmark.c \
+	route/qdisc/fifo.c route/qdisc/htb.c route/qdisc/netem.c \
+	route/qdisc/prio.c route/qdisc/red.c route/qdisc/sfq.c \
+	route/qdisc/tbf.c \
 	\
 	fib_lookup/lookup.c fib_lookup/request.c \
 	\
diff --git a/lib/cli/qdisc/bfifo.c b/lib/cli/qdisc/bfifo.c
index 710d6c4..1ee4777 100644
--- a/lib/cli/qdisc/bfifo.c
+++ b/lib/cli/qdisc/bfifo.c
@@ -11,7 +11,7 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
-#include <netlink/route/sch/fifo.h>
+#include <netlink/route/qdisc/fifo.h>
 
 static void print_usage(void)
 {
diff --git a/lib/cli/qdisc/htb.c b/lib/cli/qdisc/htb.c
index 32ed272..1751595 100644
--- a/lib/cli/qdisc/htb.c
+++ b/lib/cli/qdisc/htb.c
@@ -11,7 +11,7 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
-#include <netlink/route/sch/htb.h>
+#include <netlink/route/qdisc/htb.h>
 
 static void print_qdisc_usage(void)
 {
diff --git a/lib/cli/qdisc/pfifo.c b/lib/cli/qdisc/pfifo.c
index 946aba6..02c4d22 100644
--- a/lib/cli/qdisc/pfifo.c
+++ b/lib/cli/qdisc/pfifo.c
@@ -12,7 +12,7 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/cli/tc.h>
-#include <netlink/route/sch/fifo.h>
+#include <netlink/route/qdisc/fifo.h>
 
 static void print_usage(void)
 {
diff --git a/lib/route/sch/blackhole.c b/lib/route/qdisc/blackhole.c
index 064963e..06f5380 100644
--- a/lib/route/sch/blackhole.c
+++ b/lib/route/qdisc/blackhole.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/blackhole.c	Blackhole Qdisc
+ * lib/route/qdisc/blackhole.c	Blackhole Qdisc
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
diff --git a/lib/route/sch/cbq.c b/lib/route/qdisc/cbq.c
index f750ccd..e791a10 100644
--- a/lib/route/sch/cbq.c
+++ b/lib/route/qdisc/cbq.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/cbq.c	Class Based Queueing
+ * lib/route/qdisc/cbq.c	Class Based Queueing
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/link.h>
-#include <netlink/route/sch/cbq.h>
+#include <netlink/route/qdisc/cbq.h>
 #include <netlink/route/cls/police.h>
 
 /**
diff --git a/lib/route/sch/dsmark.c b/lib/route/qdisc/dsmark.c
index 372d0b6..b5fd0d6 100644
--- a/lib/route/sch/dsmark.c
+++ b/lib/route/qdisc/dsmark.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/dsmark.c	DSMARK
+ * lib/route/qdisc/dsmark.c	DSMARK
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 #include <netlink/route/qdisc.h>
 #include <netlink/route/tc-api.h>
 #include <netlink/route/class.h>
-#include <netlink/route/sch/dsmark.h>
+#include <netlink/route/qdisc/dsmark.h>
 
 /** @cond SKIP */
 #define SCH_DSMARK_ATTR_INDICES		0x1
diff --git a/lib/route/sch/fifo.c b/lib/route/qdisc/fifo.c
index 1399c0a..e87c79a 100644
--- a/lib/route/sch/fifo.c
+++ b/lib/route/qdisc/fifo.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/fifo.c		(p|b)fifo
+ * lib/route/qdisc/fifo.c		(p|b)fifo
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -34,7 +34,7 @@
 #include <netlink/netlink.h>
 #include <netlink/route/tc-api.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/sch/fifo.h>
+#include <netlink/route/qdisc/fifo.h>
 #include <netlink/utils.h>
 
 /** @cond SKIP */
diff --git a/lib/route/sch/htb.c b/lib/route/qdisc/htb.c
index 7f2a384..94185de 100644
--- a/lib/route/sch/htb.c
+++ b/lib/route/qdisc/htb.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/htb.c	HTB Qdisc
+ * lib/route/qdisc/htb.c	HTB Qdisc
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/link.h>
-#include <netlink/route/sch/htb.h>
+#include <netlink/route/qdisc/htb.h>
 
 /** @cond SKIP */
 #define SCH_HTB_HAS_RATE2QUANTUM	0x01
diff --git a/lib/route/sch/netem.c b/lib/route/qdisc/netem.c
index 981d96e..c86af56 100644
--- a/lib/route/sch/netem.c
+++ b/lib/route/qdisc/netem.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/netem.c		Network Emulator Qdisc
+ * lib/route/qdisc/netem.c		Network Emulator Qdisc
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 #include <netlink/utils.h>
 #include <netlink/route/tc-api.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/sch/netem.h>
+#include <netlink/route/qdisc/netem.h>
 
 /** @cond SKIP */
 #define SCH_NETEM_ATTR_LATENCY		0x0001
diff --git a/lib/route/sch/prio.c b/lib/route/qdisc/prio.c
index 6f8ff34..2433c61 100644
--- a/lib/route/sch/prio.c
+++ b/lib/route/qdisc/prio.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/prio.c		PRIO Qdisc/Class
+ * lib/route/qdisc/prio.c		PRIO Qdisc/Class
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@
 #include <netlink/utils.h>
 #include <netlink/route/tc-api.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/sch/prio.h>
+#include <netlink/route/qdisc/prio.h>
 
 /** @cond SKIP */
 #define SCH_PRIO_ATTR_BANDS	1
diff --git a/lib/route/sch/red.c b/lib/route/qdisc/red.c
index 5df3f3c..0480282 100644
--- a/lib/route/sch/red.c
+++ b/lib/route/qdisc/red.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/red.c		RED Qdisc
+ * lib/route/qdisc/red.c		RED Qdisc
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 #include <netlink/utils.h>
 #include <netlink/route/tc-api.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/sch/red.h>
+#include <netlink/route/qdisc/red.h>
 
 /** @cond SKIP */
 #define RED_ATTR_LIMIT		0x01
diff --git a/lib/route/sch/sfq.c b/lib/route/qdisc/sfq.c
index e817a6a..207140f 100644
--- a/lib/route/sch/sfq.c
+++ b/lib/route/qdisc/sfq.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/sfq.c		SFQ Qdisc
+ * lib/route/qdisc/sfq.c		SFQ Qdisc
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
 #include <netlink/utils.h>
 #include <netlink/route/tc-api.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/sch/sfq.h>
+#include <netlink/route/qdisc/sfq.h>
 
 /** @cond SKIP */
 #define SCH_SFQ_ATTR_QUANTUM	0x01
diff --git a/lib/route/sch/tbf.c b/lib/route/qdisc/tbf.c
index 8e76a5b..8a6c400 100644
--- a/lib/route/sch/tbf.c
+++ b/lib/route/qdisc/tbf.c
@@ -1,5 +1,5 @@
 /*
- * lib/route/sch/tbf.c		TBF Qdisc
+ * lib/route/qdisc/tbf.c		TBF Qdisc
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 #include <netlink/route/qdisc.h>
 #include <netlink/route/class.h>
 #include <netlink/route/link.h>
-#include <netlink/route/sch/tbf.h>
+#include <netlink/route/qdisc/tbf.h>
 
 /** @cond SKIP */
 #define TBF_ATTR_LIMIT			0x01