1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00

- Assert that immpkt is not set

- convert %lx to 32-bit safe %jx
This commit is contained in:
Kip Macy 2008-01-14 07:55:56 +00:00
parent 346de09f2a
commit 8b7399ad30
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=175316

View File

@ -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);
}