net/sched: Remove uapi support for ATM qdisc

Commit fb38306ceb9e ("net/sched: Retire ATM qdisc") retired the ATM qdisc.
Remove UAPI 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 1e3a2b9ddf7e40a80cc57081c0e4b6918777b140..28f08acdad52e79d9ec8bcf1235e4b772d686711 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -557,21 +557,6 @@ enum {
 
 #define TCA_CBQ_MAX    (__TCA_CBQ_MAX - 1)
 
-/* ATM  section */
-
-enum {
-       TCA_ATM_UNSPEC,
-       TCA_ATM_FD,             /* file/socket descriptor */
-       TCA_ATM_PTR,            /* pointer to descriptor - later */
-       TCA_ATM_HDR,            /* LL header */
-       TCA_ATM_EXCESS,         /* excess traffic class (0 for CLP)  */
-       TCA_ATM_ADDR,           /* PVC address (for output only) */
-       TCA_ATM_STATE,          /* VC state (ATM_VS_*; for output only) */
-       __TCA_ATM_MAX,
-};
-
-#define TCA_ATM_MAX    (__TCA_ATM_MAX - 1)
-
 /* Network emulator */
 
 enum {

diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h
index 0f164f1458fd8edc64ed2f3ec9bba8addbc9febb..fc695429bc59ffcb7c8f1b5c7691087a77459189 100644 (file)
--- a/tools/include/uapi/linux/pkt_sched.h
+++ b/tools/include/uapi/linux/pkt_sched.h
@@ -537,21 +537,6 @@ enum {
 
 #define TCA_CBQ_MAX    (__TCA_CBQ_MAX - 1)
 
-/* ATM  section */
-
-enum {
-       TCA_ATM_UNSPEC,
-       TCA_ATM_FD,             /* file/socket descriptor */
-       TCA_ATM_PTR,            /* pointer to descriptor - later */
-       TCA_ATM_HDR,            /* LL header */
-       TCA_ATM_EXCESS,         /* excess traffic class (0 for CLP)  */
-       TCA_ATM_ADDR,           /* PVC address (for output only) */
-       TCA_ATM_STATE,          /* VC state (ATM_VS_*; for output only) */
-       __TCA_ATM_MAX,
-};
-
-#define TCA_ATM_MAX    (__TCA_ATM_MAX - 1)
-
 /* Network emulator */
 
 enum {