From 1977659625c7458f340a57881ecdefdb6cd9633a Mon Sep 17 00:00:00 2001 From: James Smart Date: Fri, 3 Aug 2012 12:32:52 -0400 Subject: [PATCH] --- yaml --- r: 328775 b: refs/heads/master c: 9731592bb448d375c489a0fb07fe7c8abc02d222 h: refs/heads/master i: 328773: 415eb739d1fb62ebdc37eea486f44627c5fca092 328771: 6958e879ad687ebbe99512c16bb0a8b46c67aa90 328767: e058e7fbf7e491003624ed00c9fb8cdba6bd2fd2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_bsg.c | 2 ++ trunk/drivers/scsi/lpfc/lpfc_hw4.h | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7fbb4fcd5c60..2b22585ec9aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b7652ccb77bf0cc362a7b24505b950a28e15f50 +refs/heads/master: 9731592bb448d375c489a0fb07fe7c8abc02d222 diff --git a/trunk/drivers/scsi/lpfc/lpfc_bsg.c b/trunk/drivers/scsi/lpfc/lpfc_bsg.c index 253d9a857346..830f6cc9964a 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_bsg.c +++ b/trunk/drivers/scsi/lpfc/lpfc_bsg.c @@ -1714,6 +1714,8 @@ lpfc_sli4_bsg_set_link_diag_state(struct lpfc_hba *phba, uint32_t diag) phba->sli4_hba.lnk_info.lnk_no); link_diag_state = &pmboxq->u.mqe.un.link_diag_state; + bf_set(lpfc_mbx_set_diag_state_diag_bit_valid, &link_diag_state->u.req, + LPFC_DIAG_STATE_DIAG_BIT_VALID_CHANGE); bf_set(lpfc_mbx_set_diag_state_link_num, &link_diag_state->u.req, phba->sli4_hba.lnk_info.lnk_no); bf_set(lpfc_mbx_set_diag_state_link_type, &link_diag_state->u.req, diff --git a/trunk/drivers/scsi/lpfc/lpfc_hw4.h b/trunk/drivers/scsi/lpfc/lpfc_hw4.h index 953603a7a43c..9f5c93c5fda3 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_hw4.h +++ b/trunk/drivers/scsi/lpfc/lpfc_hw4.h @@ -1382,6 +1382,11 @@ struct lpfc_mbx_set_link_diag_state { #define lpfc_mbx_set_diag_state_diag_SHIFT 0 #define lpfc_mbx_set_diag_state_diag_MASK 0x00000001 #define lpfc_mbx_set_diag_state_diag_WORD word0 +#define lpfc_mbx_set_diag_state_diag_bit_valid_SHIFT 2 +#define lpfc_mbx_set_diag_state_diag_bit_valid_MASK 0x00000001 +#define lpfc_mbx_set_diag_state_diag_bit_valid_WORD word0 +#define LPFC_DIAG_STATE_DIAG_BIT_VALID_NO_CHANGE 0 +#define LPFC_DIAG_STATE_DIAG_BIT_VALID_CHANGE 1 #define lpfc_mbx_set_diag_state_link_num_SHIFT 16 #define lpfc_mbx_set_diag_state_link_num_MASK 0x0000003F #define lpfc_mbx_set_diag_state_link_num_WORD word0