diff options
author | James Smart <james.smart@emulex.com> | 2010-01-26 23:08:55 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-02-08 19:39:02 -0500 |
commit | 4fede78f7552479c4bb3bab221133ec5244e4154 (patch) | |
tree | e328de984674850a139b48730a52cde271f4a509 /drivers/scsi/lpfc/lpfc.h | |
parent | 65467b6bdffd3efde111444663bc9de35b59b22a (diff) |
[SCSI] lpfc 8.3.8: (BSG1) Update BSG infrastructure
Update BSG infrastructure to handle new vendor specific BSG commands.
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc.h')
-rw-r--r-- | drivers/scsi/lpfc/lpfc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index 197dc3e3bdc9..a40a45b8aede 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
@@ -1,7 +1,7 @@ | |||
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 | * Fibre Channel Host Bus Adapters. * | 3 | * Fibre Channel Host Bus Adapters. * |
4 | * Copyright (C) 2004-2009 Emulex. All rights reserved. * | 4 | * Copyright (C) 2004-2010 Emulex. All rights reserved. * |
5 | * EMULEX and SLI are trademarks of Emulex. * | 5 | * EMULEX and SLI are trademarks of Emulex. * |
6 | * www.emulex.com * | 6 | * www.emulex.com * |
7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * | 7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * |
@@ -451,6 +451,8 @@ struct unsol_rcv_ct_ctx { | |||
451 | uint32_t ctxt_id; | 451 | uint32_t ctxt_id; |
452 | uint32_t SID; | 452 | uint32_t SID; |
453 | uint32_t oxid; | 453 | uint32_t oxid; |
454 | uint32_t flags; | ||
455 | #define UNSOL_VALID 0x00000001 | ||
454 | }; | 456 | }; |
455 | 457 | ||
456 | struct lpfc_hba { | 458 | struct lpfc_hba { |
@@ -793,7 +795,7 @@ struct lpfc_hba { | |||
793 | uint16_t vlan_id; | 795 | uint16_t vlan_id; |
794 | struct list_head fcf_conn_rec_list; | 796 | struct list_head fcf_conn_rec_list; |
795 | 797 | ||
796 | struct mutex ct_event_mutex; /* synchronize access to ct_ev_waiters */ | 798 | spinlock_t ct_ev_lock; /* synchronize access to ct_ev_waiters */ |
797 | struct list_head ct_ev_waiters; | 799 | struct list_head ct_ev_waiters; |
798 | struct unsol_rcv_ct_ctx ct_ctx[64]; | 800 | struct unsol_rcv_ct_ctx ct_ctx[64]; |
799 | uint32_t ctx_idx; | 801 | uint32_t ctx_idx; |