Skip to content

Commit 41bc3e8

Browse files
jhsmtdavem330
authored andcommitted
net/sched: Remove uapi support for rsvp classifier
commit 265b4da ("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 <[email protected]> Reviewed-by: Pedro Tammela <[email protected]> Signed-off-by: Jamal Hadi Salim <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d8213ef commit 41bc3e8

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

include/uapi/linux/pkt_cls.h

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -280,37 +280,6 @@ struct tc_u32_pcnt {
280280

281281
#define TC_U32_MAXDEPTH 8
282282

283-
284-
/* RSVP filter */
285-
286-
enum {
287-
TCA_RSVP_UNSPEC,
288-
TCA_RSVP_CLASSID,
289-
TCA_RSVP_DST,
290-
TCA_RSVP_SRC,
291-
TCA_RSVP_PINFO,
292-
TCA_RSVP_POLICE,
293-
TCA_RSVP_ACT,
294-
__TCA_RSVP_MAX
295-
};
296-
297-
#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
298-
299-
struct tc_rsvp_gpi {
300-
__u32 key;
301-
__u32 mask;
302-
int offset;
303-
};
304-
305-
struct tc_rsvp_pinfo {
306-
struct tc_rsvp_gpi dpi;
307-
struct tc_rsvp_gpi spi;
308-
__u8 protocol;
309-
__u8 tunnelid;
310-
__u8 tunnelhdr;
311-
__u8 pad;
312-
};
313-
314283
/* ROUTE filter */
315284

316285
enum {

tools/include/uapi/linux/pkt_cls.h

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -204,37 +204,6 @@ struct tc_u32_pcnt {
204204

205205
#define TC_U32_MAXDEPTH 8
206206

207-
208-
/* RSVP filter */
209-
210-
enum {
211-
TCA_RSVP_UNSPEC,
212-
TCA_RSVP_CLASSID,
213-
TCA_RSVP_DST,
214-
TCA_RSVP_SRC,
215-
TCA_RSVP_PINFO,
216-
TCA_RSVP_POLICE,
217-
TCA_RSVP_ACT,
218-
__TCA_RSVP_MAX
219-
};
220-
221-
#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
222-
223-
struct tc_rsvp_gpi {
224-
__u32 key;
225-
__u32 mask;
226-
int offset;
227-
};
228-
229-
struct tc_rsvp_pinfo {
230-
struct tc_rsvp_gpi dpi;
231-
struct tc_rsvp_gpi spi;
232-
__u8 protocol;
233-
__u8 tunnelid;
234-
__u8 tunnelhdr;
235-
__u8 pad;
236-
};
237-
238207
/* ROUTE filter */
239208

240209
enum {

0 commit comments

Comments
 (0)