summaryrefslogtreecommitdiffstats
path: root/sys/dev/nve
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2005-12-07 17:36:53 +0000
committerobrien <obrien@FreeBSD.org>2005-12-07 17:36:53 +0000
commit04ab64a414b2475c7277777bfd0fe489a0ac3940 (patch)
tree61d9ca25153098892ea1354723b51a6f379f59fe /sys/dev/nve
parent0136d3f8f0339b6c9bb65cd3765ecfc1e78468ad (diff)
downloadFreeBSD-src-04ab64a414b2475c7277777bfd0fe489a0ac3940.zip
FreeBSD-src-04ab64a414b2475c7277777bfd0fe489a0ac3940.tar.gz
Catch up to the nvenetlib 1.0-0310 import.
Diffstat (limited to 'sys/dev/nve')
-rw-r--r--sys/dev/nve/if_nve.c8
-rw-r--r--sys/dev/nve/if_nvereg.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index 8122c6c..69176e8 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2005 by David E. O'Brien <obrien@FreeBSD.org>.
* Copyright (c) 2003,2004 by Quinton Dolan <q@onthenet.com.au>.
* All rights reserved.
@@ -26,7 +26,6 @@
*
* $Id: if_nv.c,v 1.19 2004/08/12 14:00:05 q Exp $
*/
-
/*
* NVIDIA nForce MCP Networking Adapter driver
*
@@ -70,7 +69,6 @@
* Written by Quinton Dolan <q@onthenet.com.au>
* Portions based on existing FreeBSD network drivers.
* NVIDIA API usage derived from distributed NVIDIA NVNET driver source files.
- *
*/
#include <sys/cdefs.h>
@@ -112,6 +110,7 @@ __FBSDID("$FreeBSD$");
#include "miibus_if.h"
/* Include NVIDIA Linux driver header files */
+#include <contrib/dev/nve/nvenet_version.h>
#define linux
#include <contrib/dev/nve/basetype.h>
#include <contrib/dev/nve/phy.h>
@@ -309,6 +308,9 @@ nve_attach(device_t dev)
ADAPTER_OPEN_PARAMS OpenParams;
int error = 0, i, rid;
+ if (bootverbose)
+ device_printf(dev, "nvenetlib.o version %s\n", DRIVER_VERSION);
+
DEBUGOUT(NVE_DEBUG_INIT, "nve: nve_attach - entry\n");
sc = device_get_softc(dev);
diff --git a/sys/dev/nve/if_nvereg.h b/sys/dev/nve/if_nvereg.h
index 88c5a4a..f9e0900 100644
--- a/sys/dev/nve/if_nvereg.h
+++ b/sys/dev/nve/if_nvereg.h
@@ -51,7 +51,7 @@
#define TX_RING_SIZE 64
#define RX_RING_SIZE 64
-#define NV_MAX_FRAGS 63
+#define NV_MAX_FRAGS 32 // match adapter.h:ADAPTER_WRITE_DATA.sElement[]
#define FCS_LEN 4
OpenPOWER on IntegriCloud