]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge branch 'netem-add-nsec-scheduling-and-slot-feature'
authorDavid S. Miller <davem@davemloft.net>
Mon, 13 Nov 2017 01:15:47 +0000 (10:15 +0900)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Nov 2017 01:15:47 +0000 (10:15 +0900)
commit907a4425f73c510ffaccef9f43cf7ddc458e5493
tree3a8edeabfa792dfacb6e4996be69c206ae20f857
parent338d182fa542b3ca05456ad1ce9cebe6580083b1
parent836af83b54e3e285c4a0cc06c24aeb737d3e0e18
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>