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 63e376a5727b840a742416c04e6a777c1aa20af2..4f6d69c6b08308605714822856a632898ad44413 100644 (file)
--- 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 6126c06e36c9d047a9b7fff161efc846af2c48d0..2c205402743cdef0cb749448f25e0bb981922f3c 100644 (file)
--- 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_ */