Mercurial > illumos > illumos-gate
changeset 13579:eb88ab5c1435
968 fct driver sets incorrect fc-ct revision
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Mathieu Simon <mathieu.simon@simweb.ch>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| author | Dan McDonald <danmcd@nexenta.com> |
|---|---|
| date | Fri, 27 Jan 2012 00:27:36 -0500 |
| parents | dbfc0ca2987b |
| children | e7b96961e15f |
| files | usr/src/uts/common/io/comstar/port/fct/fct.c usr/src/uts/common/sys/fct.h |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/comstar/port/fct/fct.c Sun Jan 22 10:22:06 2012 +0100 +++ b/usr/src/uts/common/io/comstar/port/fct/fct.c Fri Jan 27 00:27:36 2012 -0500 @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. */ #include <sys/conf.h> @@ -2739,7 +2740,7 @@ ASSERT(0); } - FCT_FILL_CTIU_PREAMPLE(p, ctop); + FCT_FILL_CTIU_PREAMBLE(p, ctop); return (cmd); }
--- a/usr/src/uts/common/sys/fct.h Sun Jan 22 10:22:06 2012 +0100 +++ b/usr/src/uts/common/sys/fct.h Fri Jan 27 00:27:36 2012 -0500 @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. */ #ifndef _FCT_H #define _FCT_H @@ -367,14 +368,14 @@ #define FCT_IOF_FORCE_FCA_DONE 0x20000 /* - * Fill CTIU preample + * Fill CTIU preamble */ #ifdef lint -#define FCT_FILL_CTIU_PREAMPLE(x_payload, x_ctop) _NOTE(EMPTY) +#define FCT_FILL_CTIU_PREAMBLE(x_payload, x_ctop) _NOTE(EMPTY) #else -#define FCT_FILL_CTIU_PREAMPLE(x_payload, x_ctop) \ +#define FCT_FILL_CTIU_PREAMBLE(x_payload, x_ctop) \ do { \ - x_payload[0] = 0x02; \ + x_payload[0] = 0x01; \ x_payload[4] = 0xFC; \ x_payload[5] = 0x02; \ x_payload[8] = 0xFF & (x_ctop >> 8); \