Commit 051d44209842 ("net/sched: Retire CBQ qdisc") retired the CBQ qdisc. Remove UAPI for it. Iproute2 will sync by equally removing it from user space.
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -477,86 +477,6 @@ enum { · 476 unmodified lines | ||
| 477 | 477 | |
| 478 | 478 | #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1) |
| 479 | 479 | |
| 480 | − | |
| 481 | −/* CBQ section */ | |
| 482 | − | |
| 483 | −#define TC_CBQ_MAXPRIO 8 | |
| 484 | −#define TC_CBQ_MAXLEVEL 8 | |
| 485 | −#define TC_CBQ_DEF_EWMA 5 | |
| 486 | − | |
| 487 | −struct tc_cbq_lssopt { | |
| 488 | − unsigned char change; | |
| 489 | − unsigned char flags; | |
| 490 | −#define TCF_CBQ_LSS_BOUNDED 1 | |
| 491 | −#define TCF_CBQ_LSS_ISOLATED 2 | |
| 492 | − unsigned char ewma_log; | |
| 493 | − unsigned char level; | |
| 494 | −#define TCF_CBQ_LSS_FLAGS 1 | |
| 495 | −#define TCF_CBQ_LSS_EWMA 2 | |
| 496 | −#define TCF_CBQ_LSS_MAXIDLE 4 | |
| 497 | −#define TCF_CBQ_LSS_MINIDLE 8 | |
| 498 | −#define TCF_CBQ_LSS_OFFTIME 0x10 | |
| 499 | −#define TCF_CBQ_LSS_AVPKT 0x20 | |
| 500 | − __u32 maxidle; | |
| 501 | − __u32 minidle; | |
| 502 | − __u32 offtime; | |
| 503 | − __u32 avpkt; | |
| 504 | −}; | |
| 505 | − | |
| 506 | −struct tc_cbq_wrropt { | |
| 507 | − unsigned char flags; | |
| 508 | − unsigned char priority; | |
| 509 | − unsigned char cpriority; | |
| 510 | − unsigned char __reserved; | |
| 511 | − __u32 allot; | |
| 512 | − __u32 weight; | |
| 513 | −}; | |
| 514 | − | |
| 515 | −struct tc_cbq_ovl { | |
| 516 | − unsigned char strategy; | |
| 517 | −#define TC_CBQ_OVL_CLASSIC 0 | |
| 518 | −#define TC_CBQ_OVL_DELAY 1 | |
| 519 | −#define TC_CBQ_OVL_LOWPRIO 2 | |
| 520 | −#define TC_CBQ_OVL_DROP 3 | |
| 521 | −#define TC_CBQ_OVL_RCLASSIC 4 | |
| 522 | − unsigned char priority2; | |
| 523 | − __u16 pad; | |
| 524 | − __u32 penalty; | |
| 525 | −}; | |
| 526 | − | |
| 527 | −struct tc_cbq_police { | |
| 528 | − unsigned char police; | |
| 529 | − unsigned char __res1; | |
| 530 | − unsigned short __res2; | |
| 531 | −}; | |
| 532 | − | |
| 533 | −struct tc_cbq_fopt { | |
| 534 | − __u32 split; | |
| 535 | − __u32 defmap; | |
| 536 | − __u32 defchange; | |
| 537 | −}; | |
| 538 | − | |
| 539 | −struct tc_cbq_xstats { | |
| 540 | − __u32 borrows; | |
| 541 | − __u32 overactions; | |
| 542 | − __s32 avgidle; | |
| 543 | − __s32 undertime; | |
| 544 | −}; | |
| 545 | − | |
| 546 | −enum { | |
| 547 | − TCA_CBQ_UNSPEC, | |
| 548 | − TCA_CBQ_LSSOPT, | |
| 549 | − TCA_CBQ_WRROPT, | |
| 550 | − TCA_CBQ_FOPT, | |
| 551 | − TCA_CBQ_OVL_STRATEGY, | |
| 552 | − TCA_CBQ_RATE, | |
| 553 | − TCA_CBQ_RTAB, | |
| 554 | − TCA_CBQ_POLICE, | |
| 555 | − __TCA_CBQ_MAX, | |
| 556 | −}; | |
| 557 | − | |
| 558 | −#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) | |
| 559 | − | |
| 560 | 480 | /* Network emulator */ |
| 561 | 481 | |
| 562 | 482 | enum { |