diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-04 02:22:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-04 02:22:21 -0700 |
commit | a29889a5369d2604c2053bcd051519a2445d8a70 (patch) | |
tree | b17e8258894d079b4168994d9438ba7d6e7d1523 /include/net/pkt_sched.h | |
parent | e7a088f935180b90cfe6ab0aaae8a556f46885fe (diff) | |
parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/net/pkt_sched.h')
-rw-r--r-- | include/net/pkt_sched.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index 82a3191375f..7eafb8d5447 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); |