diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
commit | b4c43993f448d0e25fe40690d9e9c81a8ebda623 (patch) | |
tree | 7cc19990b0b00226ce3063d956790368bfe62ada /drivers/scsi/qla2xxx/qla_bsg.h | |
parent | 63ff05910d9652f8a0c4dbb6c7772cfca5364f12 (diff) | |
parent | e90b25fa40a43f63fc9a035c11ba9ca3e4e60949 (diff) | |
download | blackbird-obmc-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.gz blackbird-obmc-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_bsg.h')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_bsg.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.h b/drivers/scsi/qla2xxx/qla_bsg.h index e5c2126221e9..d38f9efa56fa 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.h +++ b/drivers/scsi/qla2xxx/qla_bsg.h @@ -1,6 +1,6 @@ /* * QLogic Fibre Channel HBA Driver - * Copyright (c) 2003-2013 QLogic Corporation + * Copyright (c) 2003-2014 QLogic Corporation * * See LICENSE.qla2xxx for copyright and licensing details. */ @@ -24,6 +24,7 @@ #define QL_VND_READ_I2C 0x11 #define QL_VND_FX00_MGMT_CMD 0x12 #define QL_VND_SERDES_OP 0x13 +#define QL_VND_SERDES_OP_EX 0x14 /* BSG Vendor specific subcode returns */ #define EXT_STATUS_OK 0 @@ -225,4 +226,10 @@ struct qla_serdes_reg { uint16_t val; } __packed; +struct qla_serdes_reg_ex { + uint16_t cmd; + uint32_t addr; + uint32_t val; +} __packed; + #endif |