diff options
| author | mlaier <mlaier@FreeBSD.org> | 2010-02-13 16:04:58 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2010-02-13 16:04:58 +0000 |
| commit | b056acb8640e378c0d878874ce7f56a67b32ac83 (patch) | |
| tree | 2bbb3c25e16999b1fed53dc0860bb11438c41e07 /sys/dev/ixgbe | |
| parent | 84d671e3911041ffcdd18cb939006fec60e0abec (diff) | |
| download | FreeBSD-src-b056acb8640e378c0d878874ce7f56a67b32ac83.zip FreeBSD-src-b056acb8640e378c0d878874ce7f56a67b32ac83.tar.gz | |
Fix drbr and altq interaction:
- introduce drbr_needs_enqueue that returns whether the interface/br needs
an enqueue operation: returns true if altq is enabled or there are
already packets in the ring (as we need to maintain packet order)
- update all drbr consumers
- fix drbr_flush
- avoid using the driver queue (IFQ_DRV_*) in the altq case as the
multiqueue consumer does not provide enough protection, serialize altq
interaction with the main queue lock
- make drbr_dequeue_cond work with altq
Discussed with: kmacy, yongari, jfv
MFC after: 4 weeks
Diffstat (limited to 'sys/dev/ixgbe')
| -rw-r--r-- | sys/dev/ixgbe/ixgbe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c index bde8b94..f66443a 100644 --- a/sys/dev/ixgbe/ixgbe.c +++ b/sys/dev/ixgbe/ixgbe.c @@ -861,7 +861,7 @@ ixgbe_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr, struct mbuf *m) goto process; /* If nothing queued go right to xmit */ - if (drbr_empty(ifp, txr->br)) { + if (!drbr_needs_enqueue(ifp, txr->br)) { if ((err = ixgbe_xmit(txr, &m)) != 0) { if (m != NULL) err = drbr_enqueue(ifp, txr->br, m); |
