diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2015-12-05 12:13:56 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-12-05 12:13:56 +0000 |
| commit | 1b69fd907b999a71bcc126e824f524e847560381 (patch) | |
| tree | cb7b1d87701b1b5f61e8e54a428c6fade5d5463e /sys/dev/ic | |
| parent | dd55930e42ef10485dd92179b450775d49774ae9 (diff) | |
ifq_deq_rollback without a preceding ifq_deq_begin is fail.
caused by a badly managed merge.
found by and testing by sebastia@
ok mpi@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/rt2560.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index 0dfbdd16c3b..1dfd1e95a4b 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2560.c,v 1.78 2015/11/25 03:09:58 dlg Exp $ */ +/* $OpenBSD: rt2560.c,v 1.79 2015/12/05 12:13:55 dlg Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -1947,7 +1947,6 @@ rt2560_start(struct ifnet *ifp) } else { if (sc->txq.queued >= RT2560_TX_RING_COUNT - 1) { - ifq_deq_rollback(&ifp->if_snd, m0); ifq_set_oactive(&ifp->if_snd); sc->sc_flags |= RT2560_DATA_OACTIVE; break; |