[SCSI] qla4xxx: Use discovery_parent_idx instead of discovery_parent_type
authorAdheer Chandravanshi <adheer.chandravanshi@qlogic.com>
Mon, 8 Jul 2013 12:33:06 +0000 (08:33 -0400)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 23 Aug 2013 17:36:16 +0000 (13:36 -0400)
While setting the values for DDB, discovery_parent_idx needs to be used
instead of discovery_parent_type.

Signed-off-by: Adheer Chandravanshi <adheer.chandravanshi@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>
drivers/scsi/qla4xxx/ql4_os.c

index 9bba719..3621870 100644 (file)
@@ -2262,7 +2262,7 @@ static int qla4xxx_copy_to_fwddb_param(struct iscsi_bus_flash_session *sess,
        fw_ddb_entry->lcl_port = cpu_to_le16(conn->local_port);
        fw_ddb_entry->stat_sn = cpu_to_le32(conn->statsn);
        fw_ddb_entry->exp_stat_sn = cpu_to_le32(conn->exp_statsn);
-       fw_ddb_entry->ddb_link = cpu_to_le16(sess->discovery_parent_type);
+       fw_ddb_entry->ddb_link = cpu_to_le16(sess->discovery_parent_idx);
        fw_ddb_entry->chap_tbl_idx = cpu_to_le16(sess->chap_out_idx);
        fw_ddb_entry->tsid = cpu_to_le16(sess->tsid);
        fw_ddb_entry->port = cpu_to_le16(conn->port);
@@ -6654,8 +6654,8 @@ qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess,
                        memcpy(fnode_conn->link_local_ipv6_addr,
                               fnode_param->value, IPv6_ADDR_LEN);
                        break;
-               case ISCSI_FLASHNODE_DISCOVERY_PARENT_TYPE:
-                       fnode_sess->discovery_parent_type =
+               case ISCSI_FLASHNODE_DISCOVERY_PARENT_IDX:
+                       fnode_sess->discovery_parent_idx =
                                                *(uint16_t *)fnode_param->value;
                        break;
                case ISCSI_FLASHNODE_TCP_XMIT_WSF: