diff options
| author |   millert <millert@openbsd.org> | 2002-05-14 16:54:45 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2002-05-14 16:54:45 +0000 |
| commit | bbc3895b090353ffdf390f02f3e49d7c5181ac6b (patch) | |
| tree | 0ac910e65110f86ae5cd59dbb80d7630bc57649a | |
| parent | Use db_format in db_printsym (we'll want to be able to use printf in it soon). (diff) | |
| download | wireguard-openbsd-bbc3895b090353ffdf390f02f3e49d7c5181ac6b.tar.xz wireguard-openbsd-bbc3895b090353ffdf390f02f3e49d7c5181ac6b.zip | |
Fixed ALTQ support.
Patch from ftp://ftp.csl.sony.co.jp/pub/kjc/altq-3.1.errata.txt (kjc)
| -rw-r--r-- | sys/dev/pci/if_vr.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 8b5e62edbc0..b6415657b0b 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.25 2002/04/03 08:44:08 deraadt Exp $ */ +/* $OpenBSD: if_vr.c,v 1.26 2002/05/14 16:54:45 millert Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1300,8 +1300,12 @@ vr_start(ifp) /* Pack the data into the descriptor. */ if (vr_encap(sc, cur_tx, m_head)) { - IF_PREPEND(&ifp->if_snd, m_head); - ifp->if_flags |= IFF_OACTIVE; + if (ALTQ_IS_ENABLED(&ifp->if_snd)) { + m_freem(m_head); + } else { + IF_PREPEND(&ifp->if_snd, m_head); + ifp->if_flags |= IFF_OACTIVE; + } cur_tx = NULL; break; } |