Merge branch 'topic/aloop' into topic/misc

[~andy/linux] / drivers / scsi / be2iscsi / be_cmds.h

diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 30a293f52ef708a052a3e3f976c0aeb40e8d7051..40641d0845f4652844ff588c3c644a83d6097b78 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -56,7 +56,7 @@ struct be_mcc_wrb {
 #define CQE_STATUS_COMPL_MASK 0xFFFF
 #define CQE_STATUS_COMPL_SHIFT 0       /* bits 0 - 15 */
 #define CQE_STATUS_EXTD_MASK 0xFFFF
-#define CQE_STATUS_EXTD_SHIFT 0                /* bits 0 - 15 */
+#define CQE_STATUS_EXTD_SHIFT 16               /* bits 0 - 15 */
 
 struct be_mcc_compl {
        u32 status;             /* dword 0 */
@@ -901,6 +901,9 @@ struct be_fw_cfg {
                                                 * the cxn
                                                 */
 
+int beiscsi_pci_soft_reset(struct beiscsi_hba *phba);
+int be_chk_reset_complete(struct beiscsi_hba *phba);
+
 void be_wrb_hdr_prepare(struct be_mcc_wrb *wrb, int payload_len,
                        bool embedded, u8 sge_cnt);