2 files changed, 8 insertions, 49 deletions

diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 554b245260f5..8b5d9659063d 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -133,7 +133,7 @@ static void	cas_detach(struct cas_softc *sc);
 static int	cas_disable_rx(struct cas_softc *sc);
 static int	cas_disable_tx(struct cas_softc *sc);
 static void	cas_eint(struct cas_softc *sc, u_int status);
-static void	cas_free(struct mbuf *m, void *arg1, void* arg2);
+static void	cas_free(struct mbuf *m);
 static void	cas_init(void *xsc);
 static void	cas_init_locked(struct cas_softc *sc);
 static void	cas_init_regs(struct cas_softc *sc);
@@ -1732,16 +1732,10 @@ cas_rint(struct cas_softc *sc)
 				refcount_acquire(&rxds->rxds_refcount);
 				bus_dmamap_sync(sc->sc_rdmatag,
 				    rxds->rxds_dmamap, BUS_DMASYNC_POSTREAD);
-#if __FreeBSD_version < 800016
-				MEXTADD(m, (caddr_t)rxds->rxds_buf +
-				    off * 256 + ETHER_ALIGN, len, cas_free,
-				    rxds, M_RDONLY, EXT_NET_DRV);
-#else
-				MEXTADD(m, (caddr_t)rxds->rxds_buf +
+				m_extadd(m, (char *)rxds->rxds_buf +
 				    off * 256 + ETHER_ALIGN, len, cas_free,
 				    sc, (void *)(uintptr_t)idx,
 				    M_RDONLY, EXT_NET_DRV);
-#endif
 				if ((m->m_flags & M_EXT) == 0) {
 					m_freem(m);
 					m = NULL;
@@ -1779,16 +1773,10 @@ cas_rint(struct cas_softc *sc)
 				m->m_len = min(CAS_PAGE_SIZE - off, len);
 				bus_dmamap_sync(sc->sc_rdmatag,
 				    rxds->rxds_dmamap, BUS_DMASYNC_POSTREAD);
-#if __FreeBSD_version < 800016
-				MEXTADD(m, (caddr_t)rxds->rxds_buf + off,
-				    m->m_len, cas_free, rxds, M_RDONLY,
-				    EXT_NET_DRV);
-#else
-				MEXTADD(m, (caddr_t)rxds->rxds_buf + off,
+				m_extadd(m, (char *)rxds->rxds_buf + off,
 				    m->m_len, cas_free, sc,
 				    (void *)(uintptr_t)idx, M_RDONLY,
 				    EXT_NET_DRV);
-#endif
 				if ((m->m_flags & M_EXT) == 0) {
 					m_freem(m);
 					m = NULL;
@@ -1818,19 +1806,11 @@ cas_rint(struct cas_softc *sc)
 						    sc->sc_rdmatag,
 						    rxds2->rxds_dmamap,
 						    BUS_DMASYNC_POSTREAD);
-#if __FreeBSD_version < 800016
-						MEXTADD(m2,
-						    (caddr_t)rxds2->rxds_buf,
-						    m2->m_len, cas_free,
-						    rxds2, M_RDONLY,
-						    EXT_NET_DRV);
-#else
-						MEXTADD(m2,
-						    (caddr_t)rxds2->rxds_buf,
+						m_extadd(m2,
+						    (char *)rxds2->rxds_buf,
 						    m2->m_len, cas_free, sc,
 						    (void *)(uintptr_t)idx2,
 						    M_RDONLY, EXT_NET_DRV);
-#endif
 						if ((m2->m_flags & M_EXT) ==
 						    0) {
 							m_freem(m2);
@@ -1889,21 +1869,15 @@ cas_rint(struct cas_softc *sc)
 }
 
 static void
-cas_free(struct mbuf *m, void *arg1, void *arg2)
+cas_free(struct mbuf *m)
 {
 	struct cas_rxdsoft *rxds;
 	struct cas_softc *sc;
 	u_int idx, locked;
 
-#if __FreeBSD_version < 800016
-	rxds = arg2;
-	sc = rxds->rxds_sc;
-	idx = rxds->rxds_idx;
-#else
-	sc = arg1;
-	idx = (uintptr_t)arg2;
+	sc = m->m_ext.ext_arg1;
+	idx = (uintptr_t)m->m_ext.ext_arg2;
 	rxds = &sc->sc_rxdsoft[idx];
-#endif
 	if (refcount_release(&rxds->rxds_refcount) == 0)
 		return;
 
diff --git a/sys/dev/cas/if_casvar.h b/sys/dev/cas/if_casvar.h
index 653572c8b201..e92f277003e8 100644
--- a/sys/dev/cas/if_casvar.h
+++ b/sys/dev/cas/if_casvar.h
@@ -119,10 +119,6 @@ struct cas_rxdsoft {
 	void *rxds_buf;			/* receive buffer */
 	bus_dmamap_t rxds_dmamap;	/* our DMA map */
 	bus_addr_t rxds_paddr;		/* physical address of the segment */
-#if __FreeBSD_version < 800016
-	struct cas_softc *rxds_sc;	/* softc pointer */
-	u_int rxds_idx;			/* our index */
-#endif
 	u_int rxds_refcount;		/* hardware + mbuf references */
 };
 
@@ -239,18 +235,7 @@ do {									\
 	__CAS_UPDATE_RXDESC(&(sc)->sc_rxdescs[(d)],			\
 	    &(sc)->sc_rxdsoft[(s)], (s))
 
-#if __FreeBSD_version < 800016
-#define	CAS_INIT_RXDESC(sc, d, s)					\
-do {									\
-	struct cas_rxdsoft *__rxds = &(sc)->sc_rxdsoft[(s)];		\
-									\
-	__rxds->rxds_sc = (sc);						\
-	__rxds->rxds_idx = (s);						\
-	__CAS_UPDATE_RXDESC(&(sc)->sc_rxdescs[(d)], __rxds, (s));	\
-} while (0)
-#else
 #define	CAS_INIT_RXDESC(sc, d, s)	CAS_UPDATE_RXDESC(sc, d, s)
-#endif
 
 #define	CAS_LOCK_INIT(_sc, _name)					\
 	mtx_init(&(_sc)->sc_mtx, _name, MTX_NETWORK_LOCK, MTX_DEF)