From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sun, 20 Nov 2005 13:08:35 +0000 (+0000)
Subject: Prefer m_getcl() to EPIC_MGETCLUSTER() which uses MGETHDR()+MCLGET()
X-Git-Tag: v2.0.1~5624
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/290d24acc72ca6873d75becb7a9cdd14457dcaca

Prefer m_getcl() to EPIC_MGETCLUSTER() which uses MGETHDR()+MCLGET()
---

diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index f9c84fc5c8..5ac150971a 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.30 2005/11/20 11:59:54 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.31 2005/11/20 13:08:35 sephe Exp $
  */
 
 /*
@@ -517,7 +517,7 @@ epic_ifstart(struct ifnet *ifp)
 		/* If packet was more than EPIC_MAX_FRAGS parts, */
 		/* recopy packet to new allocated mbuf cluster */
 		if (NULL != m) {
-			EPIC_MGETCLUSTER(m);
+			m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 			if (NULL == m) {
 				m_freem(m0);
 				ifp->if_oerrors++;
@@ -591,7 +591,7 @@ epic_rx_done(epic_softc_t *sc)
 		m = buf->mbuf;
 
 		/* Try to get mbuf cluster */
-		EPIC_MGETCLUSTER(buf->mbuf);
+		buf->mbuf = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 		if (NULL == buf->mbuf) {
 			buf->mbuf = m;
 			desc->status = 0x8000;
@@ -1444,7 +1444,7 @@ epic_init_rings(epic_softc_t *sc)
 			return EFAULT;
 		}
 
-		EPIC_MGETCLUSTER(buf->mbuf);
+		buf->mbuf = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 		if (NULL == buf->mbuf) {
 			epic_free_rings(sc);
 			return ENOBUFS;
diff --git a/sys/dev/netif/tx/if_txvar.h b/sys/dev/netif/tx/if_txvar.h
index eed964a28e..ccb47d77ff 100644
--- a/sys/dev/netif/tx/if_txvar.h
+++ b/sys/dev/netif/tx/if_txvar.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_txvar.h,v 1.14.2.1 2002/10/29 01:43:50 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_txvar.h,v 1.6 2005/11/20 11:59:54 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_txvar.h,v 1.7 2005/11/20 13:08:35 sephe Exp $
  */
 
 /*
@@ -120,16 +120,3 @@ struct epic_type {
 	epic_read_phy_reg((sc), (phy), (reg))
 #define	PHY_WRITE_2(sc, phy, reg, val)					\
 	epic_write_phy_reg((sc), (phy), (reg), (val))
-
-/* Macro to get either mbuf cluster or nothing */
-#define EPIC_MGETCLUSTER(m)						\
-	{ MGETHDR((m),MB_DONTWAIT,MT_DATA);				\
-	  if (m) {							\
-	    MCLGET((m),MB_DONTWAIT);					\
-	    if( 0 == ((m)->m_flags & M_EXT) ) {				\
-	      m_freem(m);						\
-	      (m) = NULL;						\
-	    }								\
-	  }								\
-	}
-