diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index f2aff3f4042b..17e4974d4445 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -1,27 +1,24 @@ | |||
1 | /******************************************************************* | 1 | /******************************************************************* |
2 | * This file is part of the Emulex Linux Device Driver for * | 2 | * This file is part of the Emulex Linux Device Driver for * |
3 | * Enterprise Fibre Channel Host Bus Adapters. * | 3 | * Fibre Channel Host Bus Adapters. * |
4 | * Refer to the README file included with this package for * | 4 | * Copyright (C) 2004-2005 Emulex. All rights reserved. * |
5 | * driver version and adapter support. * | 5 | * EMULEX and SLI are trademarks of Emulex. * |
6 | * Copyright (C) 2004 Emulex Corporation. * | ||
7 | * www.emulex.com * | 6 | * www.emulex.com * |
7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * | ||
8 | * * | 8 | * * |
9 | * This program is free software; you can redistribute it and/or * | 9 | * This program is free software; you can redistribute it and/or * |
10 | * modify it under the terms of the GNU General Public License * | 10 | * modify it under the terms of version 2 of the GNU General * |
11 | * as published by the Free Software Foundation; either version 2 * | 11 | * Public License as published by the Free Software Foundation. * |
12 | * of the License, or (at your option) any later version. * | 12 | * This program is distributed in the hope that it will be useful. * |
13 | * * | 13 | * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * |
14 | * This program is distributed in the hope that it will be useful, * | 14 | * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of * | 15 | * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | 16 | * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * |
17 | * GNU General Public License for more details, a copy of which * | 17 | * TO BE LEGALLY INVALID. See the GNU General Public License for * |
18 | * can be found in the file COPYING included with this package. * | 18 | * more details, a copy of which can be found in the file COPYING * |
19 | * included with this package. * | ||
19 | *******************************************************************/ | 20 | *******************************************************************/ |
20 | 21 | ||
21 | /* | ||
22 | * $Id: lpfc_scsi.c 1.37 2005/04/13 14:27:09EDT sf_support Exp $ | ||
23 | */ | ||
24 | |||
25 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
26 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
27 | 24 | ||
@@ -874,6 +871,7 @@ __lpfc_abort_handler(struct scsi_cmnd *cmnd) | |||
874 | else | 871 | else |
875 | icmd->ulpCommand = CMD_CLOSE_XRI_CN; | 872 | icmd->ulpCommand = CMD_CLOSE_XRI_CN; |
876 | 873 | ||
874 | abtsiocb->iocb_cmpl = lpfc_sli_abort_fcp_cmpl; | ||
877 | if (lpfc_sli_issue_iocb(phba, pring, abtsiocb, 0) == | 875 | if (lpfc_sli_issue_iocb(phba, pring, abtsiocb, 0) == |
878 | IOCB_ERROR) { | 876 | IOCB_ERROR) { |
879 | list_add_tail(&abtsiocb->list, lpfc_iocb_list); | 877 | list_add_tail(&abtsiocb->list, lpfc_iocb_list); |
@@ -1273,4 +1271,5 @@ struct scsi_host_template lpfc_template = { | |||
1273 | .cmd_per_lun = LPFC_CMD_PER_LUN, | 1271 | .cmd_per_lun = LPFC_CMD_PER_LUN, |
1274 | .use_clustering = ENABLE_CLUSTERING, | 1272 | .use_clustering = ENABLE_CLUSTERING, |
1275 | .shost_attrs = lpfc_host_attrs, | 1273 | .shost_attrs = lpfc_host_attrs, |
1274 | .max_sectors = 0xFFFF, | ||
1276 | }; | 1275 | }; |