- Take advantage of bus_dmamap_load_mbuf_sg(9).

- Take advantage of m_collapse(9).
- Sync with other NIC drivers and prepend a TX mbuf if the first attempt
  to load it fails with an error other than EFBIG and stop trying instead
  of freeing it and keeping on trying to enqueue more mbufs. Also ensure
  the driver queue isn't empty before trying to enqueue mbufs in order to
  reduce locking operations.
- In xl_ifmedia_upd() add a missing XL_UNLOCK(). [1]
- Const'ify the xl_devs array.
- Remove an outdated comment.

PR:		113406 [1]
MFC after:	1 month

1 files changed, 2 insertions, 1 deletions

diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index ca393f3eec5a..65c46d2f57e2 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -486,6 +486,7 @@ struct xl_chain_onefrag {
 struct xl_chain_data {
 	struct xl_chain_onefrag	xl_rx_chain[XL_RX_LIST_CNT];
 	struct xl_chain		xl_tx_chain[XL_TX_LIST_CNT];
+	bus_dma_segment_t	xl_tx_segs[XL_MAXFRAGS];
 
 	struct xl_chain_onefrag	*xl_rx_head;
 
@@ -589,7 +590,7 @@ struct xl_softc {
 	struct resource		*xl_irq;
 	struct resource		*xl_res;
 	device_t		xl_miibus;
-	struct xl_type		*xl_info;	/* 3Com adapter info */
+	const struct xl_type	*xl_info;	/* 3Com adapter info */
 	bus_dma_tag_t		xl_mtag;
 	bus_dmamap_t		xl_tmpmap;	/* spare DMA map */
 	u_int8_t		xl_unit;	/* interface number */