summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-08-22 01:33:34 +0200
committerDavid S. Miller <davem@davemloft.net>2009-08-23 03:09:17 +0200
commitee5f9757ea17759e1ce5503bdae2b07e48e32af9 (patch)
tree0625fdaf307890a0875981d28ecb77e7ddd96143 /include/net
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff)
downloadlinux-ee5f9757ea17759e1ce5503bdae2b07e48e32af9.tar.xz
linux-ee5f9757ea17759e1ce5503bdae2b07e48e32af9.zip
pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer
None of this stuff should execute in hw IRQ context, therefore use a tasklet_hrtimer so that it runs in softirq context. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/pkt_sched.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 82a3191375f5..7eafb8d54470 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -61,8 +61,8 @@ psched_tdiff_bounded(psched_time_t tv1, psched_time_t tv2, psched_time_t bound)
}
struct qdisc_watchdog {
- struct hrtimer timer;
- struct Qdisc *qdisc;
+ struct tasklet_hrtimer timer;
+ struct Qdisc *qdisc;
};
extern void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc);