GIT f7ff898ad3971cd36967453d331c57d97d407007 master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git --- Signed-off-by: Andrew Morton --- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 ++++++---- fc4/fc.c | 0 scsi/ibmvscsi/srp.h | 0 3 files changed, 6 insertions(+), 4 deletions(-) diff -puN drivers/fc4/fc.c~git-scsi-rc-fixes drivers/fc4/fc.c diff -puN drivers/scsi/aic7xxx/aic7xxx_osm.c~git-scsi-rc-fixes drivers/scsi/aic7xxx/aic7xxx_osm.c --- devel/drivers/scsi/aic7xxx/aic7xxx_osm.c~git-scsi-rc-fixes 2005-07-30 13:18:43.000000000 -0700 +++ devel-akpm/drivers/scsi/aic7xxx/aic7xxx_osm.c 2005-07-30 13:18:44.000000000 -0700 @@ -1635,9 +1635,9 @@ ahc_send_async(struct ahc_softc *ahc, ch spi_period(starget) = tinfo->curr.period; spi_width(starget) = tinfo->curr.width; spi_offset(starget) = tinfo->curr.offset; - spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ; - spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ; - spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ; + spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0; + spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0; + spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0; spi_display_xfer_agreement(starget); break; } @@ -2435,8 +2435,10 @@ static void ahc_linux_set_dt(struct scsi if (dt) { period = 9; /* 12.5ns is the only period valid for DT */ ppr_options |= MSG_EXT_PPR_DT_REQ; - } else if (period == 9) + } else if (period == 9) { period = 10; /* if resetting DT, period must be >= 25ns */ + ppr_options &= ~MSG_EXT_PPR_DT_REQ; + } ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, starget->channel + 'A', ROLE_INITIATOR); diff -puN drivers/scsi/ibmvscsi/srp.h~git-scsi-rc-fixes drivers/scsi/ibmvscsi/srp.h _