From 84e09fe2473fb85a3f8ff7d592a1244d8f60fdbd Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 8 Mar 2006 12:56:56 +0100 Subject: [PATCH] --- yaml --- r: 22591 b: refs/heads/master c: 0aa800db8f1927aefe6f0ba6ce9d70f044374aef h: refs/heads/master i: 22589: 95b3b477d317561b91aa49f43ae53252b7614610 22587: cd9969fd8b7507069c37260a6c0fd37fa0cfdf5c 22583: 32c0146f51c85be51abf428919e0cea7ee601524 22575: c99a52aa76323139cdd83baff9bea5d7c76cf52f 22559: a5357c354ab0b5e8f58a93618066973edb47520c 22527: 39c72eff6be891261acf8c0b8203327be14b8cf6 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aic7xxx/aic79xx_osm.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e27fd3fdf158..55965b1c5eca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b22da38b64a32df20fdb7272deb7546045fccec +refs/heads/master: 0aa800db8f1927aefe6f0ba6ce9d70f044374aef diff --git a/trunk/drivers/scsi/aic7xxx/aic79xx_osm.c b/trunk/drivers/scsi/aic7xxx/aic79xx_osm.c index fc393bd95f4a..4eb7bba24a68 100644 --- a/trunk/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/trunk/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -1336,14 +1336,12 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo, switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) { case AHD_DEV_Q_BASIC: - scsi_adjust_queue_depth(sdev, - MSG_SIMPLE_TASK, - dev->openings + dev->active); + scsi_set_tag_type(sdev, MSG_SIMPLE_TASK); + scsi_activate_tcq(sdev, dev->openings + dev->active); break; case AHD_DEV_Q_TAGGED: - scsi_adjust_queue_depth(sdev, - MSG_ORDERED_TASK, - dev->openings + dev->active); + scsi_set_tag_type(sdev, MSG_ORDERED_TASK); + scsi_activate_tcq(sdev, dev->openings + dev->active); break; default: /* @@ -1352,9 +1350,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo, * serially on the controller/device. This should * remove some latency. */ - scsi_adjust_queue_depth(sdev, - /*NON-TAGGED*/0, - /*queue depth*/2); + scsi_deactivate_tcq(sdev, 1); break; } }