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/e1000/if_em.c | |
| 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/e1000/if_em.c')
| -rw-r--r-- | sys/dev/e1000/if_em.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 546b453..b45e478 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -955,7 +955,7 @@ em_mq_start_locked(struct ifnet *ifp, struct mbuf *m) || (!adapter->link_active)) { error = drbr_enqueue(ifp, adapter->br, m); return (error); - } else if (drbr_empty(ifp, adapter->br) && + } else if (!drbr_needs_enqueue(ifp, adapter->br) && (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { if ((error = em_xmit(adapter, &m)) != 0) { if (m) |
