diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:22:55 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:26:56 +1100 |
commit | c1ea68f0237fc3e8ea5a6c084af9bda6b9a3722c (patch) | |
tree | 18f1c1a9ec816260ae4576496fa0b40559fb7dfd /include/linux/pkt_sched.h | |
parent | 9a6cf71fa371180543df9f196e93986e37582c81 (diff) | |
parent | 25f13048bce61f33f6a102e0bf377fd3922ed364 (diff) |
Merge commit 'net/master'
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'include/linux/pkt_sched.h')
-rw-r--r-- | include/linux/pkt_sched.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 5d921fa91a5b..e3f133adba78 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -500,4 +500,20 @@ struct tc_netem_corrupt #define NETEM_DIST_SCALE 8192 +/* DRR */ + +enum +{ + TCA_DRR_UNSPEC, + TCA_DRR_QUANTUM, + __TCA_DRR_MAX +}; + +#define TCA_DRR_MAX (__TCA_DRR_MAX - 1) + +struct tc_drr_stats +{ + u32 deficit; +}; + #endif |