diff options
| author | vkashyap <vkashyap@FreeBSD.org> | 2004-05-12 04:10:37 +0000 |
|---|---|---|
| committer | vkashyap <vkashyap@FreeBSD.org> | 2004-05-12 04:10:37 +0000 |
| commit | 14bc83bc9c967d7557e40bd525990e9c923ff4e1 (patch) | |
| tree | b30e9b3f85b9e6742f97dcf417b5d4416767f8e0 /sys/dev/twe | |
| parent | db27194e31283993707fc97cedf0154d60f25123 (diff) | |
| download | FreeBSD-src-14bc83bc9c967d7557e40bd525990e9c923ff4e1.zip FreeBSD-src-14bc83bc9c967d7557e40bd525990e9c923ff4e1.tar.gz | |
1. Fixed potential problem that would cause out-of-order requests in twe_startio.
2. Changed version.
Submitted by: scottl
Reviewed by: vkashyap
Approved by: re
Diffstat (limited to 'sys/dev/twe')
| -rw-r--r-- | sys/dev/twe/twe.c | 10 | ||||
| -rw-r--r-- | sys/dev/twe/twereg.h | 2 | ||||
| -rw-r--r-- | sys/dev/twe/twevar.h | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c index e3c2073..e935c89 100644 --- a/sys/dev/twe/twe.c +++ b/sys/dev/twe/twe.c @@ -396,13 +396,13 @@ twe_startio(struct twe_softc *sc) /* build a command from an outstanding bio */ if (tr == NULL) { - /* see if there's work to be done */ - if ((bp = twe_dequeue_bio(sc)) == NULL) + /* get a command to handle the bio with */ + if (twe_get_request(sc, &tr)) break; - /* get a command to handle the bio with */ - if (twe_get_request(sc, &tr)) { - twe_enqueue_bio(sc, bp); /* failed, put the bio back */ + /* see if there's work to be done */ + if ((bp = twe_dequeue_bio(sc)) == NULL) { + twe_release_request(tr); break; } diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h index 5737b82..f6e7db6 100644 --- a/sys/dev/twe/twereg.h +++ b/sys/dev/twe/twereg.h @@ -100,7 +100,7 @@ /* PCI related defines */ #define TWE_IO_CONFIG_REG 0x10 -#define TWE_DEVICE_NAME "3ware 7000 series Storage Controller" +#define TWE_DEVICE_NAME "3ware Storage Controller" #define TWE_VENDOR_ID 0x13C1 #define TWE_DEVICE_ID 0x1000 #define TWE_DEVICE_ID_ASIC 0x1001 diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h index 9b8aa7a..393846b 100644 --- a/sys/dev/twe/twevar.h +++ b/sys/dev/twe/twevar.h @@ -27,11 +27,7 @@ * $FreeBSD$ */ -/* - * The scheme for the driver version is: - * <major change>.<external release>.<3ware internal release>.<development release> - */ -#define TWE_DRIVER_VERSION_STRING "1.50.01.000" +#define TWE_DRIVER_VERSION_STRING "1.50.01.001" #ifdef TWE_DEBUG #define debug(level, fmt, args...) \ |
