[Midnightbsd-cvs] src [7235] trunk/sys/dev: use newer memory allocation style
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 11 21:33:53 EDT 2015
Revision: 7235
http://svnweb.midnightbsd.org/src/?rev=7235
Author: laffer1
Date: 2015-08-11 21:33:52 -0400 (Tue, 11 Aug 2015)
Log Message:
-----------
use newer memory allocation style
Modified Paths:
--------------
trunk/sys/dev/bwi/if_bwi.c
trunk/sys/dev/ce/if_ce.c
trunk/sys/dev/dc/if_dc.c
trunk/sys/dev/de/if_de.c
trunk/sys/dev/fxp/if_fxp.c
trunk/sys/dev/gem/if_gem.c
trunk/sys/dev/gem/if_gem_pci.c
trunk/sys/dev/hme/if_hme.c
trunk/sys/dev/my/if_my.c
trunk/sys/dev/vge/if_vge.c
Modified: trunk/sys/dev/bwi/if_bwi.c
===================================================================
--- trunk/sys/dev/bwi/if_bwi.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/bwi/if_bwi.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -2533,7 +2533,7 @@
KASSERT(buf_idx < BWI_RX_NDESC, ("buf_idx %d", buf_idx));
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
error = ENOBUFS;
@@ -3014,7 +3014,7 @@
/*
* Setup the embedded TX header
*/
- M_PREPEND(m, sizeof(*hdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
if (m == NULL) {
if_printf(ifp, "%s: prepend TX header failed\n", __func__);
return ENOBUFS;
@@ -3073,7 +3073,7 @@
if (error) { /* error == EFBIG */
struct mbuf *m_new;
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
if_printf(ifp, "%s: can't defrag TX buffer\n",
__func__);
@@ -3194,7 +3194,7 @@
/*
* Setup the embedded TX header
*/
- M_PREPEND(m, sizeof(*hdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
if (m == NULL) {
if_printf(ifp, "%s: prepend TX header failed\n", __func__);
return ENOBUFS;
@@ -3248,7 +3248,7 @@
__func__, error);
goto back;
}
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
if_printf(ifp, "%s: can't defrag TX buffer\n",
__func__);
Modified: trunk/sys/dev/ce/if_ce.c
===================================================================
--- trunk/sys/dev/ce/if_ce.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/ce/if_ce.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -319,10 +319,10 @@
{
struct mbuf *m;
- MGETHDR (m, M_DONTWAIT, MT_DATA);
+ MGETHDR (m, M_NOWAIT, MT_DATA);
if (! m)
return 0;
- MCLGET (m, M_DONTWAIT);
+ MCLGET (m, M_NOWAIT);
if (! (m->m_flags & M_EXT)) {
m_freem (m);
return 0;
Modified: trunk/sys/dev/dc/if_dc.c
===================================================================
--- trunk/sys/dev/dc/if_dc.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/dc/if_dc.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -150,7 +150,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct dc_type const dc_devs[] = {
+static const struct dc_type dc_devs[] = {
{ DC_DEVID(DC_VENDORID_DEC, DC_DEVICEID_21143), 0,
"Intel 21143 10/100BaseTX" },
{ DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9009), 0,
@@ -2650,7 +2650,7 @@
bus_dma_segment_t segs[1];
int error, nseg;
- 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;
@@ -3387,7 +3387,7 @@
defragged = 0;
if (sc->dc_flags & DC_TX_COALESCE &&
((*m_head)->m_next != NULL || sc->dc_flags & DC_TX_ALIGN)) {
- m = m_defrag(*m_head, M_DONTWAIT);
+ m = m_defrag(*m_head, M_NOWAIT);
defragged = 1;
} else {
/*
@@ -3402,7 +3402,7 @@
if (i > DC_TX_LIST_CNT / 4 ||
DC_TX_LIST_CNT - i + sc->dc_cdata.dc_tx_cnt <=
DC_TX_LIST_RSVD) {
- m = m_collapse(*m_head, M_DONTWAIT, DC_MAXFRAGS);
+ m = m_collapse(*m_head, M_NOWAIT, DC_MAXFRAGS);
defragged = 1;
}
}
@@ -3419,7 +3419,7 @@
error = bus_dmamap_load_mbuf_sg(sc->dc_tx_mtag,
sc->dc_cdata.dc_tx_map[idx], *m_head, segs, &nseg, 0);
if (error == EFBIG) {
- if (defragged != 0 || (m = m_collapse(*m_head, M_DONTWAIT,
+ if (defragged != 0 || (m = m_collapse(*m_head, M_NOWAIT,
DC_MAXFRAGS)) == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/de/if_de.c
===================================================================
--- trunk/sys/dev/de/if_de.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/de/if_de.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -257,7 +257,7 @@
* to verify the connectivity.
*/
TULIP_LOCK_ASSERT(sc);
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return 0;
/*
@@ -3517,7 +3517,7 @@
ms->m_pkthdr.len = total_len;
ms->m_pkthdr.rcvif = ifp;
m0 = ms;
- ms = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ ms = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
#endif
TULIP_UNLOCK(sc);
CTR1(KTR_TULIP, "tulip_rx_intr: passing %p to upper layer", m0);
@@ -3528,7 +3528,7 @@
* If we are priming the TULIP with mbufs, then allocate
* a new cluster for the next descriptor.
*/
- ms = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ ms = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
#ifndef __NO_STRICT_ALIGNMENT
skip_input:
@@ -3970,7 +3970,7 @@
* to recopy it into one mbuf and then try again. If
* we can't recopy it, try again later.
*/
- m0 = m_defrag(m, M_DONTWAIT);
+ m0 = m_defrag(m, M_NOWAIT);
if (m0 == NULL) {
sc->tulip_flags |= TULIP_WANTTXSTART;
#if defined(TULIP_DEBUG)
Modified: trunk/sys/dev/fxp/if_fxp.c
===================================================================
--- trunk/sys/dev/fxp/if_fxp.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/fxp/if_fxp.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/sys/dev/fxp/if_fxp.c,v 1.9 2013/01/08 00:56:16 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
/*
* Intel EtherExpress Pro/100B PCI Fast Ethernet driver
@@ -111,7 +111,7 @@
*
* See struct fxp_cb_config for the bit definitions.
*/
-static const u_char const fxp_cb_config_template[] = {
+static const u_char fxp_cb_config_template[] = {
0x0, 0x0, /* cb_status */
0x0, 0x0, /* cb_command */
0x0, 0x0, 0x0, 0x0, /* link_addr */
@@ -155,7 +155,7 @@
* particular variants, but we don't currently differentiate between
* them.
*/
-static const struct fxp_ident const fxp_ident_table[] = {
+static const struct fxp_ident fxp_ident_table[] = {
{ 0x1029, -1, 0, "Intel 82559 PCI/CardBus Pro/100" },
{ 0x1030, -1, 0, "Intel 82559 Pro/100 Ethernet" },
{ 0x1031, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" },
@@ -452,7 +452,6 @@
* Enable bus mastering.
*/
pci_enable_busmaster(dev);
- val = pci_read_config(dev, PCIR_COMMAND, 2);
/*
* Figure out which we should try first - memory mapping or i/o mapping?
@@ -610,6 +609,7 @@
* is a valid cacheline size (8 or 16 dwords), then tell
* the board to turn on MWI.
*/
+ val = pci_read_config(dev, PCIR_COMMAND, 2);
if (val & PCIM_CMD_MWRICEN &&
pci_read_config(dev, PCIR_CACHELNSZ, 1) != 0)
sc->flags |= FXP_FLAG_MWI_ENABLE;
@@ -1448,7 +1448,7 @@
if (M_WRITABLE(*m_head) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
if (m == NULL) {
*m_head = NULL;
@@ -1564,7 +1564,7 @@
error = bus_dmamap_load_mbuf_sg(sc->fxp_txmtag, txp->tx_map, *m_head,
segs, &nseg, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, sc->maxtxseg);
+ m = m_collapse(*m_head, M_NOWAIT, sc->maxtxseg);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -2636,7 +2636,7 @@
bus_dmamap_t tmp_map;
int error;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
@@ -3067,7 +3067,7 @@
int length;
u_short int_delay_offset;
u_short bundle_max_offset;
-} const ucode_table[] = {
+} ucode_table[] = {
{ FXP_REV_82558_A4, UCODE(fxp_ucode_d101a), D101_CPUSAVER_DWORD, 0 },
{ FXP_REV_82558_B0, UCODE(fxp_ucode_d101b0), D101_CPUSAVER_DWORD, 0 },
{ FXP_REV_82559_A0, UCODE(fxp_ucode_d101ma),
Modified: trunk/sys/dev/gem/if_gem.c
===================================================================
--- trunk/sys/dev/gem/if_gem.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/gem/if_gem.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -1120,7 +1120,7 @@
cflags = 0;
if (((*m_head)->m_pkthdr.csum_flags & sc->sc_csum_features) != 0) {
if (M_WRITABLE(*m_head) == 0) {
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
*m_head = m;
if (m == NULL)
@@ -1143,7 +1143,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sc_tdmatag, txs->txs_dmamap,
*m_head, txsegs, &nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, GEM_NTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, GEM_NTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1663,7 +1663,7 @@
GEM_LOCK_ASSERT(sc, MA_OWNED);
- 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 = m->m_ext.ext_size;
Modified: trunk/sys/dev/gem/if_gem_pci.c
===================================================================
--- trunk/sys/dev/gem/if_gem_pci.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/gem/if_gem_pci.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -104,7 +104,7 @@
uint32_t gpd_devid;
int gpd_variant;
const char *gpd_desc;
-} const gem_pci_devlist[] = {
+} gem_pci_devlist[] = {
{ 0x1101108e, GEM_SUN_ERI, "Sun ERI 10/100 Ethernet" },
{ 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet" },
{ 0x0021106b, GEM_APPLE_GMAC, "Apple UniNorth GMAC Ethernet" },
Modified: trunk/sys/dev/hme/if_hme.c
===================================================================
--- trunk/sys/dev/hme/if_hme.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/hme/if_hme.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -564,7 +564,7 @@
hme_discard_rxbuf(sc, ri);
return (0);
}
- if ((m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
+ if ((m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
b = mtod(m, uintptr_t);
@@ -742,6 +742,10 @@
u_int32_t n, v;
HME_LOCK_ASSERT(sc, MA_OWNED);
+
+ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+ return;
+
/*
* Initialization sequence. The numbered steps below correspond
* to the sequence outlined in section 6.3.5.1 in the Ethernet
@@ -951,7 +955,7 @@
cflags = 0;
if (((*m0)->m_pkthdr.csum_flags & sc->sc_csum_features) != 0) {
if (M_WRITABLE(*m0) == 0) {
- m = m_dup(*m0, M_DONTWAIT);
+ m = m_dup(*m0, M_NOWAIT);
m_freem(*m0);
*m0 = m;
if (m == NULL)
@@ -974,7 +978,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sc_tdmatag, htx->htx_dmamap,
*m0, segs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m0, M_DONTWAIT, HME_NTXSEGS);
+ m = m_collapse(*m0, M_NOWAIT, HME_NTXSEGS);
if (m == NULL) {
m_freem(*m0);
*m0 = NULL;
@@ -1324,6 +1328,7 @@
/* check for fatal errors that needs reset to unfreeze DMA engine */
if ((status & HME_SEB_STAT_FATAL_ERRORS) != 0) {
HME_WHINE(sc->sc_dev, "error signaled, status=%#x\n", status);
+ sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
hme_init_locked(sc);
}
}
@@ -1370,6 +1375,7 @@
device_printf(sc->sc_dev, "device timeout (no link)\n");
++ifp->if_oerrors;
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
hme_init_locked(sc);
hme_start_locked(ifp);
return (EJUSTRETURN);
Modified: trunk/sys/dev/my/if_my.c
===================================================================
--- trunk/sys/dev/my/if_my.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/my/if_my.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -1086,13 +1086,13 @@
struct mbuf *m_new = NULL;
MY_LOCK_ASSERT(sc);
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL) {
device_printf(sc->my_dev,
"no memory for rx list -- packet dropped!\n");
return (ENOBUFS);
}
- MCLGET(m_new, M_DONTWAIT);
+ MCLGET(m_new, M_NOWAIT);
if (!(m_new->m_flags & M_EXT)) {
device_printf(sc->my_dev,
"no memory for rx list -- packet dropped!\n");
@@ -1353,13 +1353,13 @@
* chain.
*/
m = m_head;
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL) {
device_printf(sc->my_dev, "no memory for tx list");
return (1);
}
if (m_head->m_pkthdr.len > MHLEN) {
- MCLGET(m_new, M_DONTWAIT);
+ MCLGET(m_new, M_NOWAIT);
if (!(m_new->m_flags & M_EXT)) {
m_freem(m_new);
device_printf(sc->my_dev, "no memory for tx list");
Modified: trunk/sys/dev/vge/if_vge.c
===================================================================
--- trunk/sys/dev/vge/if_vge.c 2015-08-12 01:20:39 UTC (rev 7234)
+++ trunk/sys/dev/vge/if_vge.c 2015-08-12 01:33:52 UTC (rev 7235)
@@ -1239,7 +1239,7 @@
bus_dmamap_t map;
int i, nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
/*
@@ -1827,7 +1827,7 @@
padlen = VGE_MIN_FRAMELEN - m->m_pkthdr.len;
if (M_WRITABLE(m) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
if (m == NULL) {
*m_head = NULL;
@@ -1836,7 +1836,7 @@
*m_head = m;
}
if (M_TRAILINGSPACE(m) < padlen) {
- m = m_defrag(m, M_DONTWAIT);
+ m = m_defrag(m, M_NOWAIT);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1858,7 +1858,7 @@
error = bus_dmamap_load_mbuf_sg(sc->vge_cdata.vge_tx_tag,
txd->tx_dmamap, *m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, VGE_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, VGE_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
More information about the Midnightbsd-cvs
mailing list