svn commit: r189211 - in stable/7/sys: . cam contrib/pf
dev/ath/ath_hal dev/cxgb
Scott Long
scottl at FreeBSD.org
Sat Feb 28 22:57:26 PST 2009
Author: scottl
Date: Sun Mar 1 06:57:25 2009
New Revision: 189211
URL: http://svn.freebsd.org/changeset/base/189211
Log:
Merge 188570: Fix tag negotiation for pseudo-scsi devices and subsystems.
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 06:46:39 2009 (r189210)
+++ stable/7/sys/cam/cam_xpt.c Sun Mar 1 06:57:25 2009 (r189211)
@@ -6143,10 +6143,9 @@ probedone(struct cam_periph *periph, uni
xpt_schedule(periph, priority);
return;
}
- xpt_release_ccb(done_ccb);
- softc->action = PROBE_TUR_FOR_NEGOTIATION;
- xpt_schedule(periph, priority);
- return;
+
+ csio->data_ptr = NULL;
+ /* FALLTHROUGH */
}
case PROBE_SERIAL_NUM_1:
More information about the svn-src-stable-7
mailing list