net_sched: htb: do not mix 1ns and 64ns time units
authorEric Dumazet <edumazet@google.com>
Tue, 4 Jun 2013 07:11:48 +0000 (07:11 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jun 2013 17:39:04 +0000 (10:39 -0700)
commit8fa5ee7e56ae382d9fe3f3d9484c79645c81340c
tree07946ecd7af25b2e84db6539c1ff759dd87ae631
parent9042ce7879f9dfa9c5b1a30fea1f8789a15b00c3
net_sched: htb: do not mix 1ns and 64ns time units

[ Upstream commit 5343a7f8be11951cb3095b91e8e4eb506cfacc0f ]

commit 56b765b79 ("htb: improved accuracy at high rates") added another
regression for low rates, because it mixes 1ns and 64ns time units.

So the maximum delay (mbuffer) was not 60 second, but 937 ms.

Lets convert all time fields to 1ns as 64bit arches are becoming the
norm.

Reported-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/sched/sch_htb.c