diff options
| author | Andrew Gallatin <gallatin@FreeBSD.org> | 2008-07-25 15:57:55 +0000 |
|---|---|---|
| committer | Andrew Gallatin <gallatin@FreeBSD.org> | 2008-07-25 15:57:55 +0000 |
| commit | af8226ac7a72829f697b337e06a0b119933d8aae (patch) | |
| tree | ddf8755dbe0323c14edd9566de8205ee855e97d5 /sys/dev | |
| parent | faf92a44f41897694f7f44cb33b3eee7a6173b53 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mxge/if_mxge.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c index 076c32e33338..077770179fc5 100644 --- a/sys/dev/mxge/if_mxge.c +++ b/sys/dev/mxge/if_mxge.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/lock.h> #include <sys/module.h> -#include <sys/memrange.h> #include <sys/socket.h> #include <sys/sysctl.h> #include <sys/sx.h> @@ -156,32 +155,17 @@ static void mxge_enable_wc(mxge_softc_t *sc) { #if defined(__i386) || defined(__amd64) - struct mem_range_desc mrdesc; - vm_paddr_t pa; vm_offset_t len; - int err, action; + int err; sc->wc = 1; len = rman_get_size(sc->mem_res); err = pmap_change_attr((vm_offset_t) sc->sram, len, PAT_WRITE_COMBINING); - if (err == 0) - return; - else + if (err != 0) { device_printf(sc->dev, "pmap_change_attr failed, %d\n", err); - pa = rman_get_start(sc->mem_res); - mrdesc.mr_base = pa; - mrdesc.mr_len = len; - mrdesc.mr_flags = MDF_WRITECOMBINE; - action = MEMRANGE_SET_UPDATE; - strcpy((char *)&mrdesc.mr_owner, "mxge"); - err = mem_range_attr_set(&mrdesc, &action); - if (err != 0) { sc->wc = 0; - device_printf(sc->dev, - "w/c failed for pa 0x%lx, len 0x%lx, err = %d\n", - (unsigned long)pa, (unsigned long)len, err); } #endif } @@ -4239,7 +4223,7 @@ mxge_attach(device_t dev) goto abort_with_rings; } - ifp->if_baudrate = 100000000; + ifp->if_baudrate = IF_Gbps(10UL); ifp->if_capabilities = IFCAP_RXCSUM | IFCAP_TXCSUM | IFCAP_TSO4 | IFCAP_VLAN_MTU | IFCAP_LRO; |
