summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSukumar Swaminathan <Sukumar.Swaminathan@Sun.COM>2010-04-29 12:35:00 -0600
committerSukumar Swaminathan <Sukumar.Swaminathan@Sun.COM>2010-04-29 12:35:00 -0600
commit965eec0d6b2b8d25b75f15294008c17159bf852b (patch)
treef8cdbd695ad07cca19356de0aebb1f58ef0e16d2
parent468db2f465c2cf57998a476fec1d007c91f1da8a (diff)
downloadillumos-joyent-965eec0d6b2b8d25b75f15294008c17159bf852b.tar.gz
6945799 mutex problem in oce_mbox_post()
-rw-r--r--usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c1
-rw-r--r--usr/src/uts/common/sys/fibre-channel/fca/oce/oce_version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
index db4368f3e8..39888ab072 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
@@ -266,6 +266,7 @@ oce_mbox_post(struct oce_dev *dev, struct oce_mbx *mbx,
/* now dispatch */
ret = oce_mbox_dispatch(dev, tmo);
if (ret != 0) {
+ mutex_exit(&dev->bmbx_lock);
return (ret);
}
diff --git a/usr/src/uts/common/sys/fibre-channel/fca/oce/oce_version.h b/usr/src/uts/common/sys/fibre-channel/fca/oce/oce_version.h
index 5525d61db3..feb77fa213 100644
--- a/usr/src/uts/common/sys/fibre-channel/fca/oce/oce_version.h
+++ b/usr/src/uts/common/sys/fibre-channel/fca/oce/oce_version.h
@@ -38,7 +38,7 @@ extern "C" {
#define OCE_MAJOR_VERSION "1"
#define OCE_MINOR_VERSION "1"
#define OCE_RELEASE_NUM "0"
-#define OCE_PROTO_LEVEL "f"
+#define OCE_PROTO_LEVEL "f2"
#define OCE_VERSION OCE_MAJOR_VERSION "." \
OCE_MINOR_VERSION \