aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-10-10 19:32:41 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:55:59 -0400
commit3c0cfc135829b98f7a4894938652f9ef78e24237 (patch)
tree0036bb59e5d0df59d04c22c83fa265936e36939f
parent32d1316b91424423d7b44944f18cdaca268f3db2 (diff)
[NET_SCHED]: Show timer resolution instead of clock resolution in /proc/net/psched
The fourth parameter of /proc/net/psched is supposed to show the timer resultion and is used by HTB userspace to calculate the necessary burst rate. Currently we show the clock resolution, which results in a too low burst rate when the two differ. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_api.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 39d32780c80b..8ae137e3522b 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1226,10 +1226,13 @@ EXPORT_SYMBOL(tcf_destroy_chain);
1226#ifdef CONFIG_PROC_FS 1226#ifdef CONFIG_PROC_FS
1227static int psched_show(struct seq_file *seq, void *v) 1227static int psched_show(struct seq_file *seq, void *v)
1228{ 1228{
1229 struct timespec ts;
1230
1231 hrtimer_get_res(CLOCK_MONOTONIC, &ts);
1229 seq_printf(seq, "%08x %08x %08x %08x\n", 1232 seq_printf(seq, "%08x %08x %08x %08x\n",
1230 (u32)NSEC_PER_USEC, (u32)PSCHED_US2NS(1), 1233 (u32)NSEC_PER_USEC, (u32)PSCHED_US2NS(1),
1231 1000000, 1234 1000000,
1232 (u32)NSEC_PER_SEC/(u32)ktime_to_ns(KTIME_MONOTONIC_RES)); 1235 (u32)NSEC_PER_SEC/(u32)ktime_to_ns(timespec_to_ktime(ts)));
1233 1236
1234 return 0; 1237 return 0;
1235} 1238}