[Midnightbsd-cvs] src [7236] trunk/sys/dev: fix more const issues and memory allocation
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 11 21:37:40 EDT 2015
Revision: 7236
http://svnweb.midnightbsd.org/src/?rev=7236
Author: laffer1
Date: 2015-08-11 21:37:40 -0400 (Tue, 11 Aug 2015)
Log Message:
-----------
fix more const issues and memory allocation
Modified Paths:
--------------
trunk/sys/dev/hifn/hifn7751.c
trunk/sys/dev/ips/ips.c
trunk/sys/dev/ips/ips_pci.c
trunk/sys/dev/lge/if_lge.c
trunk/sys/dev/mge/if_mge.c
Modified: trunk/sys/dev/hifn/hifn7751.c
===================================================================
--- trunk/sys/dev/hifn/hifn7751.c 2015-08-12 01:33:52 UTC (rev 7235)
+++ trunk/sys/dev/hifn/hifn7751.c 2015-08-12 01:37:40 UTC (rev 7236)
@@ -180,7 +180,8 @@
}
#define WRITE_REG_1(sc, reg, val) hifn_write_reg_1(sc, reg, val)
-SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD, 0, "Hifn driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD, 0,
+ "Hifn driver parameters");
#ifdef HIFN_DEBUG
static int hifn_debug = 0;
@@ -1877,14 +1878,14 @@
totlen = cmd->src_mapsize;
if (cmd->src_m->m_flags & M_PKTHDR) {
len = MHLEN;
- MGETHDR(m0, M_DONTWAIT, MT_DATA);
- if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) {
+ MGETHDR(m0, M_NOWAIT, MT_DATA);
+ if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_NOWAIT)) {
m_free(m0);
m0 = NULL;
}
} else {
len = MLEN;
- MGET(m0, M_DONTWAIT, MT_DATA);
+ MGET(m0, M_NOWAIT, MT_DATA);
}
if (m0 == NULL) {
hifnstats.hst_nomem_mbuf++;
@@ -1892,7 +1893,7 @@
goto err_srcmap;
}
if (totlen >= MINCLSIZE) {
- MCLGET(m0, M_DONTWAIT);
+ MCLGET(m0, M_NOWAIT);
if ((m0->m_flags & M_EXT) == 0) {
hifnstats.hst_nomem_mcl++;
err = sc->sc_cmdu ? ERESTART : ENOMEM;
@@ -1906,7 +1907,7 @@
mlast = m0;
while (totlen > 0) {
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
hifnstats.hst_nomem_mbuf++;
err = sc->sc_cmdu ? ERESTART : ENOMEM;
@@ -1915,7 +1916,7 @@
}
len = MLEN;
if (totlen >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
hifnstats.hst_nomem_mcl++;
err = sc->sc_cmdu ? ERESTART : ENOMEM;
Modified: trunk/sys/dev/ips/ips.c
===================================================================
--- trunk/sys/dev/ips/ips.c 2015-08-12 01:33:52 UTC (rev 7235)
+++ trunk/sys/dev/ips/ips.c 2015-08-12 01:37:40 UTC (rev 7236)
@@ -578,7 +578,7 @@
{
int error;
bus_dma_tag_t dmatag;
- bus_dmamap_t dmamap;
+ bus_dmamap_t dmamap = NULL;
if (bus_dma_tag_create( /* parent */ sc->adapter_dmatag,
/* alignemnt */ 1,
/* boundary */ 0,
Modified: trunk/sys/dev/ips/ips_pci.c
===================================================================
--- trunk/sys/dev/ips/ips_pci.c 2015-08-12 01:33:52 UTC (rev 7235)
+++ trunk/sys/dev/ips/ips_pci.c 2015-08-12 01:37:40 UTC (rev 7236)
@@ -59,7 +59,6 @@
static int ips_pci_attach(device_t dev)
{
- u_int32_t command;
ips_softc_t *sc;
@@ -95,22 +94,18 @@
} else
goto error;
/* make sure busmastering is on */
- command = pci_read_config(dev, PCIR_COMMAND, 1);
- command |= PCIM_CMD_BUSMASTEREN;
- pci_write_config(dev, PCIR_COMMAND, command, 1);
+ pci_enable_busmaster(dev);
/* seting up io space */
sc->iores = NULL;
- if(command & PCIM_CMD_MEMEN){
- PRINTF(10, "trying MEMIO\n");
- if(pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID)
- sc->rid = PCIR_BAR(1);
- else
- sc->rid = PCIR_BAR(0);
- sc->iotype = SYS_RES_MEMORY;
- sc->iores = bus_alloc_resource_any(dev, sc->iotype,
- &sc->rid, RF_ACTIVE);
- }
- if(!sc->iores && command & PCIM_CMD_PORTEN){
+ PRINTF(10, "trying MEMIO\n");
+ if(pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID)
+ sc->rid = PCIR_BAR(1);
+ else
+ sc->rid = PCIR_BAR(0);
+ sc->iotype = SYS_RES_MEMORY;
+ sc->iores = bus_alloc_resource_any(dev, sc->iotype, &sc->rid,
+ RF_ACTIVE);
+ if(!sc->iores){
PRINTF(10, "trying PORTIO\n");
sc->rid = PCIR_BAR(0);
sc->iotype = SYS_RES_IOPORT;
Modified: trunk/sys/dev/lge/if_lge.c
===================================================================
--- trunk/sys/dev/lge/if_lge.c 2015-08-12 01:33:52 UTC (rev 7235)
+++ trunk/sys/dev/lge/if_lge.c 2015-08-12 01:37:40 UTC (rev 7236)
@@ -110,7 +110,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct lge_type const lge_devs[] = {
+static const struct lge_type lge_devs[] = {
{ LGE_VENDORID, LGE_DEVICEID, "Level 1 Gigabit Ethernet" },
{ 0, 0, NULL }
};
@@ -692,7 +692,7 @@
caddr_t *buf = NULL;
if (m == NULL) {
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL) {
device_printf(sc->lge_dev, "no memory for rx list "
"-- packet dropped!\n");
Modified: trunk/sys/dev/mge/if_mge.c
===================================================================
--- trunk/sys/dev/mge/if_mge.c 2015-08-12 01:33:52 UTC (rev 7235)
+++ trunk/sys/dev/mge/if_mge.c 2015-08-12 01:37:40 UTC (rev 7236)
@@ -375,7 +375,7 @@
KASSERT(mbufp != NULL, ("NULL mbuf pointer!"));
- new_mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ new_mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (new_mbuf == NULL)
return (ENOBUFS);
new_mbuf->m_len = new_mbuf->m_pkthdr.len = new_mbuf->m_ext.ext_size;
@@ -1489,7 +1489,7 @@
if (m0 == NULL)
break;
- mtmp = m_defrag(m0, M_DONTWAIT);
+ mtmp = m_defrag(m0, M_NOWAIT);
if (mtmp)
m0 = mtmp;
More information about the Midnightbsd-cvs
mailing list