diff options
author | kmacy <kmacy@FreeBSD.org> | 2008-01-14 07:55:56 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2008-01-14 07:55:56 +0000 |
commit | bd332c3c416401f6fead22280b41ba21f28f143c (patch) | |
tree | c2018c5c02d2b7c2b36d3056aa9a1aa6af0e9338 | |
parent | ac52885c0b330eb8194cc1a30862228df0d55714 (diff) | |
download | FreeBSD-src-bd332c3c416401f6fead22280b41ba21f28f143c.zip FreeBSD-src-bd332c3c416401f6fead22280b41ba21f28f143c.tar.gz |
- Assert that immpkt is not set
- convert %lx to 32-bit safe %jx
-rw-r--r-- | sys/dev/cxgb/cxgb_multiq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/cxgb/cxgb_multiq.c b/sys/dev/cxgb/cxgb_multiq.c index cda6ffd..fc180aa 100644 --- a/sys/dev/cxgb/cxgb_multiq.c +++ b/sys/dev/cxgb/cxgb_multiq.c @@ -173,6 +173,9 @@ cxgb_dequeue_packet(struct ifnet *unused, struct sge_txq *txq, struct mbuf **m_v struct adapter *sc; #ifndef IFNET_MULTIQUEUE struct port_info *pi = txq->port; + + if (txq->immpkt != NULL) + panic("immediate packet set"); #endif mtx_assert(&txq->lock, MA_OWNED); @@ -495,7 +498,6 @@ cxgb_pcpu_start_(struct sge_qset *qs, struct mbuf *immpkt, int tx_flush) return (err); } - int cxgb_pcpu_start(struct ifnet *ifp, struct mbuf *immpkt) { @@ -535,7 +537,7 @@ cxgb_pcpu_start(struct ifnet *ifp, struct mbuf *immpkt) mtx_unlock(&txq->lock); } else if (immpkt) { if (cxgb_debug) - printf("deferred coalesce=%lx ring_count=%d mtx_owned=%d\n", + printf("deferred coalesce=%jx ring_count=%d mtx_owned=%d\n", sc->tunq_coalesce, buf_ring_count(&txq->txq_mr), mtx_owned(&txq->lock)); err = cxgb_pcpu_enqueue_packet_(qs, immpkt); } |