]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
pkt_sched: Revert tasklet_hrtimer changes.
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Sep 2009 00:59:25 +0000 (17:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Sep 2009 00:59:25 +0000 (17:59 -0700)
commit2fbd3da3877ad8d923b055e5996f80b4d4a6daf4
tree7caa4ea3f3517d2f6b38142f64527c82b8e57b2e
parentd66ee0587c3927aea5178a822976c7c853d815fe
pkt_sched: Revert tasklet_hrtimer changes.

These are full of unresolved problems, mainly that conversions don't
work 1-1 from hrtimers to tasklet_hrtimers because unlike hrtimers
tasklets can't be killed from softirq context.

And when a qdisc gets reset, that's exactly what we need to do here.

We'll work this out in the net-next-2.6 tree and if warranted we'll
backport that work to -stable.

This reverts the following 3 changesets:

a2cb6a4dd470d7a64255a10b843b0d188416b78f
("pkt_sched: Fix bogon in tasklet_hrtimer changes.")

38acce2d7983632100a9ff3fd20295f6e34074a8
("pkt_sched: Convert CBQ to tasklet_hrtimer.")

ee5f9757ea17759e1ce5503bdae2b07e48e32af9
("pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer")

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/pkt_sched.h
net/sched/sch_api.c
net/sched/sch_cbq.c