diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-13 04:15:47 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-13 04:15:47 +0300 |
| commit | 907a4425f73c510ffaccef9f43cf7ddc458e5493 (patch) | |
| tree | 3a8edeabfa792dfacb6e4996be69c206ae20f857 /include | |
| parent | 338d182fa542b3ca05456ad1ce9cebe6580083b1 (diff) | |
| parent | 836af83b54e3e285c4a0cc06c24aeb737d3e0e18 (diff) | |
| download | linux-907a4425f73c510ffaccef9f43cf7ddc458e5493.tar.xz | |
Merge branch 'netem-add-nsec-scheduling-and-slot-feature'
Dave Taht says:
====================
netem: add nsec scheduling and slot feature
This patch series converts netem away from the old "ticks" interface and
userspace API, and adds support for a new "slot" feature intended to
emulate bursty macs such as WiFi and LTE better.
Changes since v2:
Use u64 for packet_len_sched_time()
Use simpler max(time_to_send,q->slot.slot_next)
Changes since v1:
Always pass new nanosecond APIs to userspace
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/pkt_sched.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index 6a2c5ea7e9c4..af3cc2f4e1ad 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -537,6 +537,9 @@ enum { TCA_NETEM_ECN, TCA_NETEM_RATE64, TCA_NETEM_PAD, + TCA_NETEM_LATENCY64, + TCA_NETEM_JITTER64, + TCA_NETEM_SLOT, __TCA_NETEM_MAX, }; @@ -574,6 +577,13 @@ struct tc_netem_rate { __s32 cell_overhead; }; +struct tc_netem_slot { + __s64 min_delay; /* nsec */ + __s64 max_delay; + __s32 max_packets; + __s32 max_bytes; +}; + enum { NETEM_LOSS_UNSPEC, NETEM_LOSS_GI, /* General Intuitive - 4 state model */ |