Author: bz
Date: Thu Jan 15 02:22:52 2015
New Revision: 277209
URL: https://svnweb.freebsd.org/changeset/base/277209
Log:
Fix cpsw(4) after r277203 which folded 'struct m_hdr' into 'struct mbuf'.
While in theory this should have been a transparent change (and was for all
other drivers), cpsw(4) never used the proper accessor macros in a few
places but spelt the indirect m_hdr.mh_* out itself. Convert those to
use m_len and m_data and unbreak the driver build.
Modified:
head/sys/arm/ti/cpsw/if_cpsw.c
Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpsw.c Thu Jan 15 01:20:56 2015
(r277208)
+++ head/sys/arm/ti/cpsw/if_cpsw.c Thu Jan 15 02:22:52 2015
(r277209)
@@ -396,9 +396,9 @@ cpsw_dump_slot(struct cpsw_softc *sc, st
printf("\n");
if (slot->mbuf) {
printf(" Ether: %14D\n",
- (char *)(slot->mbuf->m_hdr.mh_data), " ");
+ (char *)(slot->mbuf->m_data), " ");
printf(" Packet: %16D\n",
- (char *)(slot->mbuf->m_hdr.mh_data) + 14, " ");
+ (char *)(slot->mbuf->m_data) + 14, " ");
}
}
@@ -611,7 +611,7 @@ cpsw_attach(device_t dev)
/* Allocate the null mbuf and pre-sync it. */
sc->null_mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
- memset(sc->null_mbuf->m_hdr.mh_data, 0, sc->null_mbuf->m_ext.ext_size);
+ memset(sc->null_mbuf->m_data, 0, sc->null_mbuf->m_ext.ext_size);
bus_dmamap_create(sc->mbuf_dtag, 0, &sc->null_mbuf_dmamap);
bus_dmamap_load_mbuf_sg(sc->mbuf_dtag, sc->null_mbuf_dmamap,
sc->null_mbuf, segs, &nsegs, BUS_DMA_NOWAIT);
@@ -1292,8 +1292,8 @@ cpsw_rx_dequeue(struct cpsw_softc *sc)
/* Set up mbuf */
/* TODO: track SOP/EOP bits to assemble a full mbuf
out of received fragments. */
- slot->mbuf->m_hdr.mh_data += bd.bufoff;
- slot->mbuf->m_hdr.mh_len = bd.pktlen - 4;
+ slot->mbuf->m_data += bd.bufoff;
+ slot->mbuf->m_len = bd.pktlen - 4;
slot->mbuf->m_pkthdr.len = bd.pktlen - 4;
slot->mbuf->m_flags |= M_PKTHDR;
slot->mbuf->m_pkthdr.rcvif = ifp;
@@ -1461,7 +1461,7 @@ cpsw_tx_enqueue(struct cpsw_softc *sc)
bus_dmamap_unload(sc->mbuf_dtag, slot->dmamap);
if (padlen > 0) /* May as well add padding. */
m_append(slot->mbuf, padlen,
- sc->null_mbuf->m_hdr.mh_data);
+ sc->null_mbuf->m_data);
m0 = m_defrag(slot->mbuf, M_NOWAIT);
if (m0 == NULL) {
if_printf(sc->ifp,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
