From: VMware, Inc <>
Date: Thu, 15 Oct 2009 22:09:48 +0000 (-0700)
Subject: Stop failing every second command on pvscsi...
X-Git-Tag: 2009.10.15-201664~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2f1b83daab1d7882fd651ad1cc77c729bbd9760;p=thirdparty%2Fopen-vm-tools.git

Stop failing every second command on pvscsi...

... and stop logging every command with KERN_ERR...  Let's revert
that part of max_cmd_len change.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/pvscsi/pvscsi.c b/open-vm-tools/modules/linux/pvscsi/pvscsi.c
index 63e376a57..4f6d69c6b 100644
--- a/open-vm-tools/modules/linux/pvscsi/pvscsi.c
+++ b/open-vm-tools/modules/linux/pvscsi/pvscsi.c
@@ -619,8 +619,6 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,
 
 	LOG(3, "cmd=%p %x ctx=%p result=0x%x status=0x%x,%x\n",
 		cmd, cmd->cmnd[0], ctx, cmd->result, btstat, sdstat);
-	printk(KERN_ERR "pvscsi: cmd=%p %x ctx=%p result=0x%x status=0x%x,%x\n",
-		cmd, cmd->cmnd[0], ctx, cmd->result, btstat, sdstat);
 
 	cmd->scsi_done(cmd);
 }
@@ -724,11 +722,6 @@ static int pvscsi_queue_ring(struct pvscsi_adapter *adapter,
 		e->flags = PVSCSI_FLAG_CMD_DIR_NONE;
 	else
 		e->flags = 0;
-        { static int i = 0;
-           if (++i%2)
-              //e->flags |= PVSCSI_FLAG_CMD_OUT_OF_BAND_CDB;
-              e->flags |= (1 << 5);
-        }
 
 	pvscsi_map_buffers(adapter, ctx, cmd, e);
 
diff --git a/open-vm-tools/modules/linux/pvscsi/pvscsi_version.h b/open-vm-tools/modules/linux/pvscsi/pvscsi_version.h
index 6126c06e3..2c2054027 100644
--- a/open-vm-tools/modules/linux/pvscsi/pvscsi_version.h
+++ b/open-vm-tools/modules/linux/pvscsi/pvscsi_version.h
@@ -25,6 +25,6 @@
 #ifndef _PVSCSI_VERSION_H_
 #define _PVSCSI_VERSION_H_
 
-#define PVSCSI_DRIVER_VERSION_STRING   "1.0.1.0"
+#define PVSCSI_DRIVER_VERSION_STRING   "1.0.1.1"
 
 #endif /* _PVSCSI_VERSION_H_ */