d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Allocate the DMA memory shared between the host and the controller as

Browse Source 
coherent.
- Constify the ti_devs table.
- Don't bother to set if_mtu to ETHERMTU, ether_ifattach() does that.

MFC after:	2 weeks
This commit is contained in:
Marius Strobl 2011-03-11 22:32:17 +00:00
parent 006aaeeadf
commit a1d090d428
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/ti/if_ti.c
View File

@ -145,7 +145,7 @@ typedef enum {
* Various supported device vendors/types and their names.
*/
static struct ti_type ti_devs[] = {
static const struct ti_type const ti_devs[] = {
{ ALT_VENDORID, ALT_DEVICEID_ACENIC,
"Alteon AceNIC 1000baseSX Gigabit Ethernet" },
{ ALT_VENDORID, ALT_DEVICEID_ACENIC_COPPER,
@ -1118,7 +1118,8 @@ ti_alloc_jumbo_mem(sc)
if (bus_dmamem_alloc(sc->ti_jumbo_dmat,
(void**)&sc->ti_cdata.ti_jumbo_buf,
BUS_DMA_NOWAIT, &sc->ti_jumbo_dmamap) != 0) {
BUS_DMA_NOWAIT | BUS_DMA_COHERENT,
&sc->ti_jumbo_dmamap) != 0) {
device_printf(sc->ti_dev, "Failed to allocate jumbo memory\n");
return (ENOBUFS);
}
@ -2252,7 +2253,7 @@ static int
ti_probe(dev)
device_t dev;
{
struct ti_type *t;
const struct ti_type *t;
t = ti_devs;
@ -2389,7 +2390,8 @@ ti_attach(dev)
}
if (bus_dmamem_alloc(sc->ti_rdata_dmat, (void**)&sc->ti_rdata,
BUS_DMA_NOWAIT, &sc->ti_rdata_dmamap) != 0) {
BUS_DMA_NOWAIT | BUS_DMA_COHERENT,
&sc->ti_rdata_dmamap) != 0) {
device_printf(dev, "Failed to allocate rdata memory\n");
error = ENOMEM;
goto fail;
@ -2487,7 +2489,6 @@ ti_attach(dev)
ifp->if_start = ti_start;
ifp->if_init = ti_init;
ifp->if_baudrate = 1000000000;
ifp->if_mtu = ETHERMTU;
ifp->if_snd.ifq_maxlen = TI_TX_RING_CNT - 1;
/* Set up ifmedia support. */

2
sys/dev/ti/if_tireg.h
View File

@ -967,7 +967,7 @@ struct ti_chain_data {
struct ti_type {
u_int16_t ti_vid;
u_int16_t ti_did;
char *ti_name;
const char *ti_name;
};
#define TI_HWREV_TIGON 0x01