6794368 iscsi client broken: failed to receive login response
diff --git a/usr/src/uts/common/fs/sockfs/sockcommon_subr.c b/usr/src/uts/common/fs/sockfs/sockcommon_subr.c
index 8ad0011..781fe10 100644
--- a/usr/src/uts/common/fs/sockfs/sockcommon_subr.c
+++ b/usr/src/uts/common/fs/sockfs/sockcommon_subr.c
@@ -1592,7 +1592,9 @@
 	case SO_RCVTIMEO: {
 		clock_t value;
 		socklen_t optlen = *optlenp;
-		if (get_udatamodel() == DATAMODEL_NATIVE) {
+
+		if (get_udatamodel() == DATAMODEL_NONE ||
+		    get_udatamodel() == DATAMODEL_NATIVE) {
 			if (optlen < sizeof (struct timeval))
 				return (EINVAL);
 		} else {
@@ -1604,7 +1606,8 @@
 		else
 			value = drv_hztousec(so->so_sndtimeo);
 
-		if (get_udatamodel() == DATAMODEL_NATIVE) {
+		if (get_udatamodel() == DATAMODEL_NONE ||
+		    get_udatamodel() == DATAMODEL_NATIVE) {
 			((struct timeval *)(optval))->tv_sec =
 			    value / (1000 * 1000);
 			((struct timeval *)(optval))->tv_usec =