[Midnightbsd-cvs] src [7239] trunk/sys/dev: fix more const issues with ste, safe, sis, ske, re, ral, pci, mps
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 11 22:00:24 EDT 2015
Revision: 7239
http://svnweb.midnightbsd.org/src/?rev=7239
Author: laffer1
Date: 2015-08-11 22:00:24 -0400 (Tue, 11 Aug 2015)
Log Message:
-----------
fix more const issues with ste, safe, sis, ske, re, ral, pci, mps
Modified Paths:
--------------
trunk/sys/dev/mps/mps_mapping.c
trunk/sys/dev/mps/mps_user.c
trunk/sys/dev/msk/if_msk.c
trunk/sys/dev/pci/pci.c
trunk/sys/dev/ral/rt2560.c
trunk/sys/dev/ral/rt2661.c
trunk/sys/dev/ral/rt2860.c
trunk/sys/dev/re/if_re.c
trunk/sys/dev/safe/safe.c
trunk/sys/dev/sis/if_sis.c
trunk/sys/dev/sk/if_sk.c
trunk/sys/dev/sk/if_skreg.h
trunk/sys/dev/ste/if_ste.c
Modified: trunk/sys/dev/mps/mps_mapping.c
===================================================================
--- trunk/sys/dev/mps/mps_mapping.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/mps/mps_mapping.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -331,6 +331,8 @@
u16 ioc_pg8_flags = le16toh(sc->ioc_pg8.Flags);
start_idx = 0;
+ start_idx_ir = 0;
+ end_idx_ir = 0;
end_idx = sc->max_devices;
if (ioc_pg8_flags & MPI2_IOCPAGE8_FLAGS_RESERVED_TARGETID_0)
start_idx = 1;
Modified: trunk/sys/dev/mps/mps_user.c
===================================================================
--- trunk/sys/dev/mps/mps_user.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/mps/mps_user.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -1000,7 +1000,7 @@
if (cm->cm_flags & MPS_CM_FLAGS_DATAIN)
dir = BUS_DMASYNC_POSTREAD;
else if (cm->cm_flags & MPS_CM_FLAGS_DATAOUT)
- dir = BUS_DMASYNC_POSTWRITE;;
+ dir = BUS_DMASYNC_POSTWRITE;
bus_dmamap_sync(sc->buffer_dmat, cm->cm_dmamap, dir);
bus_dmamap_unload(sc->buffer_dmat, cm->cm_dmamap);
Modified: trunk/sys/dev/msk/if_msk.c
===================================================================
--- trunk/sys/dev/msk/if_msk.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/msk/if_msk.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -2,8 +2,8 @@
*
* Name : sky2.c
* Project: Gigabit Ethernet Driver for FreeBSD 5.x/6.x
- * Version: $Revision: 1.7 $
- * Date : $Date: 2013-01-08 03:53:24 $
+ * Version: $Revision: 1.23 $
+ * Date : $Date: 2005/12/22 09:04:11 $
* Purpose: Main driver source file
*
*****************************************************************************/
@@ -162,7 +162,7 @@
/*
* Devices supported by this driver.
*/
-static struct msk_product {
+static const struct msk_product {
uint16_t msk_vendorid;
uint16_t msk_deviceid;
const char *msk_name;
@@ -257,6 +257,7 @@
static int mskc_setup_rambuffer(struct msk_softc *);
static int mskc_suspend(device_t);
static int mskc_resume(device_t);
+static bus_dma_tag_t mskc_get_dma_tag(device_t, device_t);
static void mskc_reset(struct msk_softc *);
static int msk_probe(device_t);
@@ -334,6 +335,8 @@
DEVMETHOD(device_resume, mskc_resume),
DEVMETHOD(device_shutdown, mskc_shutdown),
+ DEVMETHOD(bus_get_dma_tag, mskc_get_dma_tag),
+
DEVMETHOD_END
};
@@ -368,9 +371,9 @@
static devclass_t msk_devclass;
-DRIVER_MODULE(mskc, pci, mskc_driver, mskc_devclass, 0, 0);
-DRIVER_MODULE(msk, mskc, msk_driver, msk_devclass, 0, 0);
-DRIVER_MODULE(miibus, msk, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE(mskc, pci, mskc_driver, mskc_devclass, NULL, NULL);
+DRIVER_MODULE(msk, mskc, msk_driver, msk_devclass, NULL, NULL);
+DRIVER_MODULE(miibus, msk, miibus_driver, miibus_devclass, NULL, NULL);
static struct resource_spec msk_res_spec_io[] = {
{ SYS_RES_IOPORT, PCIR_BAR(1), RF_ACTIVE },
@@ -897,7 +900,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);
@@ -955,7 +958,7 @@
bus_dmamap_t map;
int nsegs;
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
if (m == NULL)
return (ENOBUFS);
if ((m->m_flags & M_EXT) == 0) {
@@ -1180,7 +1183,7 @@
static int
mskc_probe(device_t dev)
{
- struct msk_product *mp;
+ const struct msk_product *mp;
uint16_t vendor, devid;
int i;
@@ -1187,8 +1190,7 @@
vendor = pci_get_vendor(dev);
devid = pci_get_device(dev);
mp = msk_products;
- for (i = 0; i < sizeof(msk_products)/sizeof(msk_products[0]);
- i++, mp++) {
+ for (i = 0; i < nitems(msk_products); i++, mp++) {
if (vendor == mp->msk_vendorid && devid == mp->msk_deviceid) {
device_set_desc(dev, mp->msk_name);
return (BUS_PROBE_DEFAULT);
@@ -1696,6 +1698,12 @@
ifp->if_capabilities |= IFCAP_VLAN_HWCSUM;
}
ifp->if_capenable = ifp->if_capabilities;
+ /*
+ * Disable RX checksum offloading on controllers that don't use
+ * new descriptor format but give chance to enable it.
+ */
+ if ((sc_if->msk_flags & MSK_FLAG_DESCV2) == 0)
+ ifp->if_capenable &= ~IFCAP_RXCSUM;
/*
* Tell the upper layer(s) we support long frames.
@@ -2113,6 +2121,13 @@
return (0);
}
+static bus_dma_tag_t
+mskc_get_dma_tag(device_t bus, device_t child __unused)
+{
+
+ return (bus_get_dma_tag(bus));
+}
+
struct msk_dmamap_arg {
bus_addr_t msk_busaddr;
};
@@ -2654,7 +2669,7 @@
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;
@@ -2733,7 +2748,7 @@
error = bus_dmamap_load_mbuf_sg(sc_if->msk_cdata.msk_tx_tag, map,
*m_head, txsegs, &nseg, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, MSK_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, MSK_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/pci/pci.c
===================================================================
--- trunk/sys/dev/pci/pci.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/pci/pci.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -210,7 +210,7 @@
int arg2;
};
-static const struct pci_quirk const pci_quirks[] = {
+static const struct pci_quirk pci_quirks[] = {
/* The Intel 82371AB and 82443MX has a map register at offset 0x90. */
{ 0x71138086, PCI_QUIRK_MAP_REG, 0x90, 0 },
{ 0x719b8086, PCI_QUIRK_MAP_REG, 0x90, 0 },
Modified: trunk/sys/dev/ral/rt2560.c
===================================================================
--- trunk/sys/dev/ral/rt2560.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/ral/rt2560.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -673,7 +673,7 @@
goto fail;
}
- data->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (data->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate rx mbuf\n");
@@ -1160,7 +1160,7 @@
* mbuf. In the unlikely case that the old mbuf can't be
* reloaded either, explicitly panic.
*/
- mnew = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (mnew == NULL) {
ifp->if_ierrors++;
goto skip;
@@ -1844,7 +1844,7 @@
return error;
}
if (error != 0) {
- mnew = m_defrag(m0, M_DONTWAIT);
+ mnew = m_defrag(m0, M_NOWAIT);
if (mnew == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
Modified: trunk/sys/dev/ral/rt2661.c
===================================================================
--- trunk/sys/dev/ral/rt2661.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/ral/rt2661.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -1,4 +1,4 @@
-/* $MidnightBSD$ */
+/* $FreeBSD: release/9.2.0/sys/dev/ral/rt2661.c 248078 2013-03-09 00:39:54Z marius $ */
/*-
* Copyright (c) 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/ral/rt2661.c 248078 2013-03-09 00:39:54Z marius $");
/*-
* Ralink Technology RT2561, RT2561S and RT2661 chipset driver
@@ -682,7 +682,7 @@
goto fail;
}
- data->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (data->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate rx mbuf\n");
@@ -1030,7 +1030,7 @@
* mbuf. In the unlikely case that the old mbuf can't be
* reloaded either, explicitly panic.
*/
- mnew = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (mnew == NULL) {
ifp->if_ierrors++;
goto skip;
@@ -1534,7 +1534,7 @@
return error;
}
if (error != 0) {
- mnew = m_defrag(m0, M_DONTWAIT);
+ mnew = m_defrag(m0, M_NOWAIT);
if (mnew == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
Modified: trunk/sys/dev/ral/rt2860.c
===================================================================
--- trunk/sys/dev/ral/rt2860.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/ral/rt2860.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -743,7 +743,7 @@
goto fail;
}
- data->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (data->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate rx mbuf\n");
@@ -1237,7 +1237,7 @@
}
#endif
- m1 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m1 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (__predict_false(m1 == NULL)) {
ifp->if_ierrors++;
goto skip;
@@ -1625,7 +1625,7 @@
}
}
if (__predict_false(error != 0)) {
- m1 = m_defrag(m, M_DONTWAIT);
+ m1 = m_defrag(m, M_NOWAIT);
if (m1 == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
@@ -1877,7 +1877,7 @@
}
}
if (__predict_false(error != 0)) {
- m1 = m_defrag(m, M_DONTWAIT);
+ m1 = m_defrag(m, M_NOWAIT);
if (m1 == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
Modified: trunk/sys/dev/re/if_re.c
===================================================================
--- trunk/sys/dev/re/if_re.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/re/if_re.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -171,7 +171,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct rl_type const re_devs[] = {
+static const struct rl_type re_devs[] = {
{ DLINK_VENDORID, DLINK_DEVICEID_528T, 0,
"D-Link DGE-528(T) Gigabit Ethernet Adapter" },
{ DLINK_VENDORID, DLINK_DEVICEID_530T_REVC, 0,
@@ -194,7 +194,7 @@
"US Robotics 997902 (RTL8169S) Gigabit Ethernet" }
};
-static const struct rl_hwrev const re_hwrevs[] = {
+static const struct rl_hwrev re_hwrevs[] = {
{ RL_HWREV_8139, RL_8139, "", RL_MTU },
{ RL_HWREV_8139A, RL_8139, "A", RL_MTU },
{ RL_HWREV_8139AG, RL_8139, "A-G", RL_MTU },
Modified: trunk/sys/dev/safe/safe.c
===================================================================
--- trunk/sys/dev/safe/safe.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/safe/safe.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -143,7 +143,8 @@
static int safe_free_entry(struct safe_softc *, struct safe_ringentry *);
-SYSCTL_NODE(_hw, OID_AUTO, safe, CTLFLAG_RD, 0, "SafeNet driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, safe, CTLFLAG_RD, 0,
+ "SafeNet driver parameters");
#ifdef SAFE_DEBUG
static void safe_dump_dmastatus(struct safe_softc *, const char *);
@@ -219,7 +220,7 @@
{
struct safe_softc *sc = device_get_softc(dev);
u_int32_t raddr;
- u_int32_t cmd, i, devinfo;
+ u_int32_t i, devinfo;
int rid;
bzero(sc, sizeof (*sc));
@@ -226,22 +227,9 @@
sc->sc_dev = dev;
/* XXX handle power management */
-
- cmd = pci_read_config(dev, PCIR_COMMAND, 4);
- cmd |= PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN;
- pci_write_config(dev, PCIR_COMMAND, cmd, 4);
- cmd = pci_read_config(dev, PCIR_COMMAND, 4);
- if (!(cmd & PCIM_CMD_MEMEN)) {
- device_printf(dev, "failed to enable memory mapping\n");
- goto bad;
- }
+ pci_enable_busmaster(dev);
- if (!(cmd & PCIM_CMD_BUSMASTEREN)) {
- device_printf(dev, "failed to enable bus mastering\n");
- goto bad;
- }
-
/*
* Setup memory-mapping of PCI registers.
*/
@@ -1324,15 +1312,15 @@
totlen = re->re_src_mapsize;
if (re->re_src_m->m_flags & M_PKTHDR) {
len = MHLEN;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m && !m_dup_pkthdr(m, re->re_src_m,
- M_DONTWAIT)) {
+ M_NOWAIT)) {
m_free(m);
m = NULL;
}
} else {
len = MLEN;
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
}
if (m == NULL) {
safestats.st_nombuf++;
@@ -1340,7 +1328,7 @@
goto errout;
}
if (totlen >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_free(m);
safestats.st_nomcl++;
@@ -1356,7 +1344,7 @@
while (totlen > 0) {
if (top) {
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
m_freem(top);
safestats.st_nombuf++;
@@ -1367,7 +1355,7 @@
len = MLEN;
}
if (top && totlen >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
*mp = m;
m_freem(top);
Modified: trunk/sys/dev/sis/if_sis.c
===================================================================
--- trunk/sys/dev/sis/if_sis.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/sis/if_sis.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -126,7 +126,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct sis_type const sis_devs[] = {
+static const struct sis_type sis_devs[] = {
{ SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
{ SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },
{ NS_VENDORID, NS_DEVICEID_DP83815, "NatSemi DP8381[56] 10/100BaseTX" },
@@ -1412,7 +1412,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 = SIS_RXLEN;
@@ -1772,7 +1772,7 @@
padlen = SIS_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;
@@ -1781,7 +1781,7 @@
*m_head = m;
}
if (m->m_next != NULL || 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;
@@ -1800,7 +1800,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sis_tx_tag, txd->tx_dmamap,
*m_head, segs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, SIS_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, SIS_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/sk/if_sk.c
===================================================================
--- trunk/sys/dev/sk/if_sk.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/sk/if_sk.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -143,7 +143,7 @@
"$MidnightBSD$";
#endif
-static struct sk_type sk_devs[] = {
+static const struct sk_type sk_devs[] = {
{
VENDORID_SK,
DEVICEID_SK_V1,
@@ -193,6 +193,7 @@
static int skc_shutdown(device_t);
static int skc_suspend(device_t);
static int skc_resume(device_t);
+static bus_dma_tag_t skc_get_dma_tag(device_t, device_t);
static int sk_detach(device_t);
static int sk_probe(device_t);
static int sk_attach(device_t);
@@ -296,6 +297,8 @@
DEVMETHOD(device_resume, skc_resume),
DEVMETHOD(device_shutdown, skc_shutdown),
+ DEVMETHOD(bus_get_dma_tag, skc_get_dma_tag),
+
DEVMETHOD_END
};
@@ -330,9 +333,9 @@
static devclass_t sk_devclass;
-DRIVER_MODULE(skc, pci, skc_driver, skc_devclass, 0, 0);
-DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
-DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE(skc, pci, skc_driver, skc_devclass, NULL, NULL);
+DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, NULL, NULL);
+DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, NULL, NULL);
static struct resource_spec sk_res_spec_io[] = {
{ SYS_RES_IOPORT, PCIR_BAR(1), RF_ACTIVE },
@@ -965,7 +968,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;
@@ -1010,7 +1013,7 @@
bus_dmamap_t map;
int nsegs;
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
if (m == NULL)
return (ENOBUFS);
if ((m->m_flags & M_EXT) == 0) {
@@ -1186,7 +1189,7 @@
skc_probe(dev)
device_t dev;
{
- struct sk_type *t = sk_devs;
+ const struct sk_type *t = sk_devs;
while(t->sk_name != NULL) {
if ((pci_get_vendor(dev) == t->sk_vid) &&
@@ -1889,6 +1892,13 @@
return(0);
}
+static bus_dma_tag_t
+skc_get_dma_tag(device_t bus, device_t child __unused)
+{
+
+ return (bus_get_dma_tag(bus));
+}
+
struct sk_dmamap_arg {
bus_addr_t sk_busaddr;
};
@@ -2394,7 +2404,7 @@
error = bus_dmamap_load_mbuf_sg(sc_if->sk_cdata.sk_tx_tag,
txd->tx_dmamap, *m_head, txsegs, &nseg, 0);
if (error == EFBIG) {
- m = m_defrag(*m_head, M_DONTWAIT);
+ m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -3186,7 +3196,7 @@
struct sk_softc *sc;
struct ifnet *ifp;
u_int16_t eaddr[(ETHER_ADDR_LEN+1)/2];
- struct sk_bcom_hack bhack[] = {
+ static const struct sk_bcom_hack bhack[] = {
{ 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 }, { 0x17, 0x0013 },
{ 0x15, 0x0404 }, { 0x17, 0x8006 }, { 0x15, 0x0132 }, { 0x17, 0x8006 },
{ 0x15, 0x0232 }, { 0x17, 0x800D }, { 0x15, 0x000F }, { 0x18, 0x0420 },
Modified: trunk/sys/dev/sk/if_skreg.h
===================================================================
--- trunk/sys/dev/sk/if_skreg.h 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/sk/if_skreg.h 2015-08-12 02:00:24 UTC (rev 7239)
@@ -1289,7 +1289,7 @@
struct sk_type {
u_int16_t sk_vid;
u_int16_t sk_did;
- char *sk_name;
+ const char *sk_name;
};
#define SK_ADDR_LO(x) ((u_int64_t) (x) & 0xffffffff)
Modified: trunk/sys/dev/ste/if_ste.c
===================================================================
--- trunk/sys/dev/ste/if_ste.c 2015-08-12 01:52:04 UTC (rev 7238)
+++ trunk/sys/dev/ste/if_ste.c 2015-08-12 02:00:24 UTC (rev 7239)
@@ -85,7 +85,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static const struct ste_type const ste_devs[] = {
+static const struct ste_type ste_devs[] = {
{ ST_VENDORID, ST_DEVICEID_ST201_1, "Sundance ST201 10/100BaseTX" },
{ ST_VENDORID, ST_DEVICEID_ST201_2, "Sundance ST201 10/100BaseTX" },
{ DL_VENDORID, DL_DEVICEID_DL10050, "D-Link DL10050 10/100BaseTX" },
@@ -1385,7 +1385,7 @@
bus_dmamap_t map;
int error, 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;
@@ -1824,7 +1824,7 @@
error = bus_dmamap_load_mbuf_sg(sc->ste_cdata.ste_tx_tag,
txc->ste_map, *m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, STE_MAXFRAGS);
+ m = m_collapse(*m_head, M_NOWAIT, STE_MAXFRAGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
More information about the Midnightbsd-cvs
mailing list