Author: scottl
Date: Sun Mar 1 07:03:35 2009
New Revision: 189214
URL: http://svn.freebsd.org/changeset/base/189214
Log:
Merge 188671: Fix negotiation for imperfect SCSI and pseudo-SCSI devices.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/cam/cam_xpt.c (contents, props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
Modified: stable/7/sys/cam/cam_xpt.c
==============================================================================
--- stable/7/sys/cam/cam_xpt.c Sun Mar 1 07:02:16 2009 (r189213)
+++ stable/7/sys/cam/cam_xpt.c Sun Mar 1 07:03:35 2009 (r189214)
@@ -6680,9 +6680,7 @@ xpt_set_transfer_settings(struct ccb_tra
if (((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0
&& (inq_data->flags & SID_Sync) == 0
&& cts->type == CTS_TYPE_CURRENT_SETTINGS)
- || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0)
- || (spi->sync_offset == 0)
- || (spi->sync_period == 0)) {
+ || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0)) {
/* Force async */
spi->sync_period = 0;
spi->sync_offset = 0;
@@ -6730,7 +6728,8 @@ xpt_set_transfer_settings(struct ccb_tra
if (spi->bus_width == 0)
spi->ppr_options = 0;
- if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) == 0) {
+ if ((spi->valid & CTS_SPI_VALID_DISC)
+ && ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) == 0)) {
/*
* Can't tag queue without disconnection.
*/
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
