rename sch -> qdisc

diff --git a/include/Makefile.am b/include/Makefile.am
index 8824dfeea10cd6ad6eebd9228990f90a4c01ed53..e7f12067982439a2ac144fdfb51bd58f5f2d4af4 100644 (file)
--- 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
similarity index 100%
rename from include/netlink/route/sch/cbq.h
rename to include/netlink/route/qdisc/cbq.h

diff --git a/include/netlink/route/sch/dsmark.h b/include/netlink/route/qdisc/dsmark.h
similarity index 100%
rename from include/netlink/route/sch/dsmark.h
rename to include/netlink/route/qdisc/dsmark.h

diff --git a/include/netlink/route/sch/fifo.h b/include/netlink/route/qdisc/fifo.h
similarity index 100%
rename from include/netlink/route/sch/fifo.h
rename to include/netlink/route/qdisc/fifo.h

diff --git a/include/netlink/route/sch/htb.h b/include/netlink/route/qdisc/htb.h
similarity index 100%
rename from include/netlink/route/sch/htb.h
rename to include/netlink/route/qdisc/htb.h

diff --git a/include/netlink/route/sch/netem.h b/include/netlink/route/qdisc/netem.h
similarity index 100%
rename from include/netlink/route/sch/netem.h
rename to include/netlink/route/qdisc/netem.h

diff --git a/include/netlink/route/sch/prio.h b/include/netlink/route/qdisc/prio.h
similarity index 100%
rename from include/netlink/route/sch/prio.h
rename to include/netlink/route/qdisc/prio.h

diff --git a/include/netlink/route/sch/red.h b/include/netlink/route/qdisc/red.h
similarity index 100%
rename from include/netlink/route/sch/red.h
rename to include/netlink/route/qdisc/red.h

diff --git a/include/netlink/route/sch/sfq.h b/include/netlink/route/qdisc/sfq.h
similarity index 100%
rename from include/netlink/route/sch/sfq.h
rename to include/netlink/route/qdisc/sfq.h

diff --git a/include/netlink/route/sch/tbf.h b/include/netlink/route/qdisc/tbf.h
similarity index 100%
rename from include/netlink/route/sch/tbf.h
rename to include/netlink/route/qdisc/tbf.h

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 25a7ac533a7477394527327f17bc2f7f11d22001..ccedf431504e7ada9ed6d43ab0bd7adc4e88c998 100644 (file)
--- 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 710d6c4c5131e36ef5cd19428df41f0b2631d7ce..1ee477735b62865fa68e429610ea1017b0752537 100644 (file)
--- 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 32ed2725c8b16a636af8bc1c7db701d097504957..1751595ec784d638d1b0e16d8d927af98f233c61 100644 (file)
--- 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 946aba6698fe32a6344b8b25163bfd28b3645cd9..02c4d2296a502fd05a12989035dd3d0a474d347a 100644 (file)
--- 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
similarity index 93%
rename from lib/route/sch/blackhole.c
rename to lib/route/qdisc/blackhole.c
index 064963e703b380a3c12e134969d3c6d1d0e54a39..06f538022a31d3e10f5e838ac73709b8a5281bec 100644 (file)
--- 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
similarity index 98%
rename from lib/route/sch/cbq.c
rename to lib/route/qdisc/cbq.c
index f750ccda11dc7857796c239bbd0b9fe6d5c7218b..e791a101755062709a64861a0e3a2bf734ed01e1 100644 (file)
--- 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
similarity index 99%
rename from lib/route/sch/dsmark.c
rename to lib/route/qdisc/dsmark.c
index 372d0b653210ed23029bf63d5e179dea75e071ca..b5fd0d6e5a8a2377c07d420500e9a49da1f805bc 100644 (file)
--- 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
similarity index 98%
rename from lib/route/sch/fifo.c
rename to lib/route/qdisc/fifo.c
index 1399c0a5bf627f71b41cfc80b4c33e240752d896..e87c79a5964e317a805d9547f3e9330c341aacb5 100644 (file)
--- 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
similarity index 99%
rename from lib/route/sch/htb.c
rename to lib/route/qdisc/htb.c
index 7f2a384f186edf3af338d3cfb3f5c8aae415b310..94185ded08ae6a75fcf12dd3407d3821afcb68ae 100644 (file)
--- 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
similarity index 99%
rename from lib/route/sch/netem.c
rename to lib/route/qdisc/netem.c
index 981d96e68222c9f6d668c557135c9e0c53cda3ee..c86af56d9e8424cf03c1d4c3d78a2363443a6465 100644 (file)
--- 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
similarity index 98%
rename from lib/route/sch/prio.c
rename to lib/route/qdisc/prio.c
index 6f8ff348645c93a6d781303ca0b9a9e7c8eaa10d..2433c61e712d8736a7a2e542068307a4c262905b 100644 (file)
--- 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
similarity index 98%
rename from lib/route/sch/red.c
rename to lib/route/qdisc/red.c
index 5df3f3c77c8db84b4f229c8db75db1c525969182..0480282a5f2d9e2028d946cde92f1f71072b6183 100644 (file)
--- 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
similarity index 98%
rename from lib/route/sch/sfq.c
rename to lib/route/qdisc/sfq.c
index e817a6aafccf3dd2cc9f935176e9e90984cf17a6..207140ff880ff38cfaa909a8c2e176c08fc5e129 100644 (file)
--- 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
similarity index 99%
rename from lib/route/sch/tbf.c
rename to lib/route/qdisc/tbf.c
index 8e76a5b6d69899c3fc7bf3622cd26f68d19f229a..8a6c4006220e31ef667a61706e256811f45e2a85 100644 (file)
--- 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