diff --git a/[refs] b/[refs] index c7a697099bca..9562f9d3c35d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be70ed189bc0d16e1609a1c6c04ec9418b4dd11a +refs/heads/master: eb9b851b980e20ba5f6bdfd6ec24f4bc77623ce6 diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index a11959908d9a..98402f0efa47 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/net/sched/sch_netem.c @@ -46,9 +46,6 @@ layering other disciplines. It does not need to do bandwidth control either since that can be handled by using token bucket or other rate control. - - The simulator is limited by the Linux timer resolution - and will create packet bursts on the HZ boundary (1ms). */ struct netem_sched_data {