diff options
| author |   henning <henning@openbsd.org> | 2014-04-19 14:47:51 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2014-04-19 14:47:51 +0000 |
| commit | bdcaae737ce61fac34267c1d3f2519bd06e9be63 (patch) | |
| tree | 01fb71a34cb18cd8a27838d7478c225d7883e25d | |
| parent | kill altq bits here as well (diff) | |
| download | wireguard-openbsd-bdcaae737ce61fac34267c1d3f2519bd06e9be63.tar.xz wireguard-openbsd-bdcaae737ce61fac34267c1d3f2519bd06e9be63.zip | |
sigh, another driver fiddling with altq outside #ifdef ALTQ
| -rw-r--r-- | sys/dev/pci/if_vr.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index b2ed7661bfb..923664c04e6 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.132 2013/12/28 03:34:54 deraadt Exp $ */ +/* $OpenBSD: if_vr.c,v 1.133 2014/04/19 14:47:51 henning Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1350,10 +1350,7 @@ vr_start(struct ifnet *ifp) head_tx = cur_tx; if (vr_encap(sc, &cur_tx, m_head)) { /* Rollback, send what we were able to encap. */ - if (ALTQ_IS_ENABLED(&ifp->if_snd)) - m_freem(m_head); - else - IF_PREPEND(&ifp->if_snd, m_head); + IF_PREPEND(&ifp->if_snd, m_head); break; } queued++; |