From 77a8d8c285ca3ca0943557974860d1ad8b773b53 Mon Sep 17 00:00:00 2001 From: Anirban Chakraborty Date: Wed, 17 Jun 2009 10:30:28 -0700 Subject: [PATCH] --- yaml --- r: 154023 b: refs/heads/master c: 27dc9c5a3d652b0d55ab9ab396dcce9f13bc77c3 h: refs/heads/master i: 154021: c5f059953e947dd7f68306ef0d87e3e8b3c8e17e 154019: 09a5d1d14a03786879c4ce3683f9d3b21fa1ad35 154015: 40da598b940d53b91f9dd983ab1d867d862c470e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2093c157b0fa..6c29871b42af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30c9afa6cc477f6f21f8a0b36f3b81080941a0c9 +refs/heads/master: 27dc9c5a3d652b0d55ab9ab396dcce9f13bc77c3 diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index dcf011679c8b..f0396e79b6fa 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -1663,7 +1663,7 @@ qla2x00_iospace_config(struct qla_hw_data *ha) /* queue 0 uses two msix vectors */ if (ql2xmultique_tag) { cpus = num_online_cpus(); - ha->max_rsp_queues = (ha->msix_count - 1 - cpus) ? + ha->max_rsp_queues = (ha->msix_count - 1 > cpus) ? (cpus + 1) : (ha->msix_count - 1); ha->max_req_queues = 2; } else if (ql2xmaxqueues > 1) {