[Midnightbsd-cvs] src [7238] trunk/sys/dev/nge/if_nge.c: remove duplicate const

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 11 21:52:04 EDT 2015


Revision: 7238
          http://svnweb.midnightbsd.org/src/?rev=7238
Author:   laffer1
Date:     2015-08-11 21:52:04 -0400 (Tue, 11 Aug 2015)
Log Message:
-----------
remove duplicate const

Modified Paths:
--------------
    trunk/sys/dev/nge/if_nge.c

Modified: trunk/sys/dev/nge/if_nge.c
===================================================================
--- trunk/sys/dev/nge/if_nge.c	2015-08-12 01:41:19 UTC (rev 7237)
+++ trunk/sys/dev/nge/if_nge.c	2015-08-12 01:52:04 UTC (rev 7238)
@@ -139,7 +139,7 @@
 /*
  * Various supported device vendors/types and their names.
  */
-static const struct nge_type const nge_devs[] = {
+static const struct nge_type nge_devs[] = {
 	{ NGE_VENDORID, NGE_DEVICEID,
 	    "National Semiconductor Gigabit Ethernet" },
 	{ 0, 0, NULL }
@@ -1381,7 +1381,7 @@
 	bus_dmamap_t map;
 	int nsegs;
 
-	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
@@ -1894,7 +1894,7 @@
 	error = bus_dmamap_load_mbuf_sg(sc->nge_cdata.nge_tx_tag, map,
 	    *m_head, txsegs, &nsegs, BUS_DMA_NOWAIT);
 	if (error == EFBIG) {
-		m = m_collapse(*m_head, M_DONTWAIT, NGE_MAXTXSEGS);
+		m = m_collapse(*m_head, M_NOWAIT, NGE_MAXTXSEGS);
 		if (m == NULL) {
 			m_freem(*m_head);
 			*m_head = NULL;



More information about the Midnightbsd-cvs mailing list