net/sched: Remove uapi support for rsvp classifier

commit 265b4da82dbf ("net/sched: Retire rsvp classifier") retired the TC RSVP
classifier.
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_cls.h b/include/uapi/linux/pkt_cls.h
index 2fec9b51d28d66fdbb7e8c7d2b02632b330cfec2..fe922b61b99e262b7e978b6d956f45679bf46c43 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -280,37 +280,6 @@ struct tc_u32_pcnt {
 
 #define TC_U32_MAXDEPTH 8
 
-
-/* RSVP filter */
-
-enum {
-       TCA_RSVP_UNSPEC,
-       TCA_RSVP_CLASSID,
-       TCA_RSVP_DST,
-       TCA_RSVP_SRC,
-       TCA_RSVP_PINFO,
-       TCA_RSVP_POLICE,
-       TCA_RSVP_ACT,
-       __TCA_RSVP_MAX
-};
-
-#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
-
-struct tc_rsvp_gpi {
-       __u32   key;
-       __u32   mask;
-       int     offset;
-};
-
-struct tc_rsvp_pinfo {
-       struct tc_rsvp_gpi dpi;
-       struct tc_rsvp_gpi spi;
-       __u8    protocol;
-       __u8    tunnelid;
-       __u8    tunnelhdr;
-       __u8    pad;
-};
-
 /* ROUTE filter */
 
 enum {

diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
index 3faee0199a9b972c2036882a607cf70cf83c2626..82eccb6a4994adbda4628065ce5ebe257de36b1b 100644 (file)
--- a/tools/include/uapi/linux/pkt_cls.h
+++ b/tools/include/uapi/linux/pkt_cls.h
@@ -204,37 +204,6 @@ struct tc_u32_pcnt {
 
 #define TC_U32_MAXDEPTH 8
 
-
-/* RSVP filter */
-
-enum {
-       TCA_RSVP_UNSPEC,
-       TCA_RSVP_CLASSID,
-       TCA_RSVP_DST,
-       TCA_RSVP_SRC,
-       TCA_RSVP_PINFO,
-       TCA_RSVP_POLICE,
-       TCA_RSVP_ACT,
-       __TCA_RSVP_MAX
-};
-
-#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
-
-struct tc_rsvp_gpi {
-       __u32   key;
-       __u32   mask;
-       int     offset;
-};
-
-struct tc_rsvp_pinfo {
-       struct tc_rsvp_gpi dpi;
-       struct tc_rsvp_gpi spi;
-       __u8    protocol;
-       __u8    tunnelid;
-       __u8    tunnelhdr;
-       __u8    pad;
-};
-
 /* ROUTE filter */
 
 enum {