diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2008-05-09 14:10:06 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2008-05-09 14:10:06 +0000 |
| commit | 0144c6a4ce98eb776fe79ea4658d198ce789d4f3 (patch) | |
| tree | 0164ad65135aab3b94333ba7ade2b12b9ca820de /sys | |
| parent | ac8f01f7ad3b7eec3350e296c1c485403cc9878b (diff) | |
switch altq from ifp->if_start to if_start() to take advantage of tx mit.
ok kjc@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/altq/altq_cbq.c | 7 | ||||
| -rw-r--r-- | sys/altq/altq_subr.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/altq/altq_cbq.c b/sys/altq/altq_cbq.c index 9b52a1bbce9..f3d70aa184c 100644 --- a/sys/altq/altq_cbq.c +++ b/sys/altq/altq_cbq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_cbq.c,v 1.24 2008/05/08 15:22:02 chl Exp $ */ +/* $OpenBSD: altq_cbq.c,v 1.25 2008/05/09 14:10:05 dlg Exp $ */ /* $KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $ */ /* @@ -511,9 +511,8 @@ cbqrestart(struct ifaltq *ifq) return; ifp = ifq->altq_ifp; - if (ifp->if_start && - cbqp->cbq_qlen > 0 && (ifp->if_flags & IFF_OACTIVE) == 0) - (*ifp->if_start)(ifp); + if (ifp->if_start && cbqp->cbq_qlen > 0) + if_start(ifp); } static void cbq_purge(cbq_state_t *cbqp) diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c index 2213f16b5d6..9fc5b874923 100644 --- a/sys/altq/altq_subr.c +++ b/sys/altq/altq_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_subr.c,v 1.25 2008/05/08 15:22:02 chl Exp $ */ +/* $OpenBSD: altq_subr.c,v 1.26 2008/05/09 14:10:05 dlg Exp $ */ /* $KAME: altq_subr.c,v 1.11 2002/01/11 08:11:49 kjc Exp $ */ /* @@ -317,7 +317,7 @@ tbr_timeout(arg) continue; active++; if (!IFQ_IS_EMPTY(&ifp->if_snd) && ifp->if_start != NULL) - (*ifp->if_start)(ifp); + if_start(ifp); } splx(s); if (active > 0) |