diff options
author | Lalit Chandivade <lalit.chandivade@qlogic.com> | 2011-10-07 19:55:41 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-16 12:08:16 -0400 |
commit | 0854f665a1cbb4566d3ebe449169b0200b8cdad0 (patch) | |
tree | 7e2e771996dd34e0f359b4471d9cf53382802721 /drivers/scsi/qla4xxx | |
parent | aecc3130da7d3a02439bcba428e9fe470ec11f6f (diff) |
[SCSI] qla4xxx: Fix bidirectional CHAP.
Driver was not setting the bidirectional CHAP bit correctly in
the DDB entry.
JIRA Key: UPSISCSI-108
Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla4xxx')
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_def.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_mbx.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h index d2f7cd64d066..a80adfc6d780 100644 --- a/drivers/scsi/qla4xxx/ql4_def.h +++ b/drivers/scsi/qla4xxx/ql4_def.h | |||
@@ -351,6 +351,8 @@ struct ipaddress_config { | |||
351 | 351 | ||
352 | #define QL4_CHAP_MAX_NAME_LEN 256 | 352 | #define QL4_CHAP_MAX_NAME_LEN 256 |
353 | #define QL4_CHAP_MAX_SECRET_LEN 100 | 353 | #define QL4_CHAP_MAX_SECRET_LEN 100 |
354 | #define LOCAL_CHAP 0 | ||
355 | #define BIDI_CHAP 1 | ||
354 | 356 | ||
355 | struct ql4_chap_format { | 357 | struct ql4_chap_format { |
356 | u8 intr_chap_name[QL4_CHAP_MAX_NAME_LEN]; | 358 | u8 intr_chap_name[QL4_CHAP_MAX_NAME_LEN]; |
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c index de733a777803..b60b90301a8b 100644 --- a/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/drivers/scsi/qla4xxx/ql4_mbx.c | |||
@@ -872,7 +872,6 @@ void qla4xxx_get_conn_event_log(struct scsi_qla_host * ha) | |||
872 | uint32_t max_event_log_entries; | 872 | uint32_t max_event_log_entries; |
873 | uint8_t i; | 873 | uint8_t i; |
874 | 874 | ||
875 | |||
876 | memset(&mbox_cmd, 0, sizeof(mbox_cmd)); | 875 | memset(&mbox_cmd, 0, sizeof(mbox_cmd)); |
877 | memset(&mbox_sts, 0, sizeof(mbox_cmd)); | 876 | memset(&mbox_sts, 0, sizeof(mbox_cmd)); |
878 | 877 | ||
@@ -1578,7 +1577,8 @@ int qla4xxx_set_param_ddbentry(struct scsi_qla_host *ha, | |||
1578 | } | 1577 | } |
1579 | 1578 | ||
1580 | rval = qla4xxx_set_chap(ha, sess->username, | 1579 | rval = qla4xxx_set_chap(ha, sess->username, |
1581 | sess->password, idx, 0); | 1580 | sess->password, idx, |
1581 | LOCAL_CHAP); | ||
1582 | if (rval) | 1582 | if (rval) |
1583 | goto exit_set_param; | 1583 | goto exit_set_param; |
1584 | 1584 | ||
@@ -1599,7 +1599,8 @@ int qla4xxx_set_param_ddbentry(struct scsi_qla_host *ha, | |||
1599 | goto exit_set_param; | 1599 | goto exit_set_param; |
1600 | } | 1600 | } |
1601 | rval = qla4xxx_set_chap(ha, sess->username_in, | 1601 | rval = qla4xxx_set_chap(ha, sess->username_in, |
1602 | sess->password_in, idx, 0); | 1602 | sess->password_in, idx, |
1603 | BIDI_CHAP); | ||
1603 | if (rval) | 1604 | if (rval) |
1604 | goto exit_set_param; | 1605 | goto exit_set_param; |
1605 | } | 1606 | } |