net/sched: Remove uapi support for dsmark qdisc

Commit bbe77c14ee61 ("net/sched: Retire dsmark qdisc") retired the dsmark
classifier. Remove UAPI support for it.
Iproute2 will sync by equally removing it from user space.

Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index f762a10bfb78ed896d8a5b936045a956d97b3831..1e3a2b9ddf7e40a80cc57081c0e4b6918777b140 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -557,20 +557,6 @@ enum {
 
 #define TCA_CBQ_MAX    (__TCA_CBQ_MAX - 1)
 
-/* dsmark section */
-
-enum {
-       TCA_DSMARK_UNSPEC,
-       TCA_DSMARK_INDICES,
-       TCA_DSMARK_DEFAULT_INDEX,
-       TCA_DSMARK_SET_TC_INDEX,
-       TCA_DSMARK_MASK,
-       TCA_DSMARK_VALUE,
-       __TCA_DSMARK_MAX,
-};
-
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
-
 /* ATM  section */
 
 enum {

diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h
index 5c903abc9fa52a52477547b8ca0ce52dcab88b62..0f164f1458fd8edc64ed2f3ec9bba8addbc9febb 100644 (file)
--- a/tools/include/uapi/linux/pkt_sched.h
+++ b/tools/include/uapi/linux/pkt_sched.h
@@ -537,20 +537,6 @@ enum {
 
 #define TCA_CBQ_MAX    (__TCA_CBQ_MAX - 1)
 
-/* dsmark section */
-
-enum {
-       TCA_DSMARK_UNSPEC,
-       TCA_DSMARK_INDICES,
-       TCA_DSMARK_DEFAULT_INDEX,
-       TCA_DSMARK_SET_TC_INDEX,
-       TCA_DSMARK_MASK,
-       TCA_DSMARK_VALUE,
-       __TCA_DSMARK_MAX,
-};
-
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
-
 /* ATM  section */
 
 enum {