diff --git a/qla2x00t/qla2x00-target/Kconfig b/qla2x00t/qla2x00-target/Kconfig index 856ea6063..539cbb4db 100644 --- a/qla2x00t/qla2x00-target/Kconfig +++ b/qla2x00t/qla2x00-target/Kconfig @@ -22,7 +22,7 @@ config QLA_TGT_DEBUG_SRR bool "SRR debugging" depends on SCST_QLA_TGT_ADDON help - Turns on restransmitting packets (SRR) + Turns on retransmitting packets (SRR) debugging. In this mode some CTIOs will be "broken" to force the initiator to issue a retransmit request. Useful for debugging and lead to big performance loss. diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c index 46a3cc469..0ba61800a 100644 --- a/qla2x00t/qla_attr.c +++ b/qla2x00t/qla_attr.c @@ -303,24 +303,6 @@ qla2x00_show_port_database(struct device *dev, MBC_PORT_NODE_NAME_LIST, le16_to_cpu(mc.mb[1])); if (IS_FWI2_CAPABLE(ha)) { - port_data_t *pmap2x = pmap; - - entries = le16_to_cpu(mc.mb[1])/sizeof(*pmap2x); - - for (i = 0; (i < entries) && (size < max_size); ++i) { - size += scnprintf(buffer+size, max_size-size, - "%04x %02x%02x%02x%02x%02x%02x%02x%02x\n", - le16_to_cpu(pmap2x[i].loop_id), - pmap2x[i].port_name[7], - pmap2x[i].port_name[6], - pmap2x[i].port_name[5], - pmap2x[i].port_name[4], - pmap2x[i].port_name[3], - pmap2x[i].port_name[2], - pmap2x[i].port_name[1], - pmap2x[i].port_name[0]); - } - } else { port24_data_t *pmap24 = pmap; entries = le16_to_cpu(mc.mb[1])/sizeof(*pmap24); @@ -338,6 +320,24 @@ qla2x00_show_port_database(struct device *dev, pmap24[i].port_name[1], pmap24[i].port_name[0]); } + } else { + port_data_t *pmap2x = pmap; + + entries = le16_to_cpu(mc.mb[1])/sizeof(*pmap2x); + + for (i = 0; (i < entries) && (size < max_size); ++i) { + size += scnprintf(buffer+size, max_size-size, + "%04x %02x%02x%02x%02x%02x%02x%02x%02x\n", + le16_to_cpu(pmap2x[i].loop_id), + pmap2x[i].port_name[7], + pmap2x[i].port_name[6], + pmap2x[i].port_name[5], + pmap2x[i].port_name[4], + pmap2x[i].port_name[3], + pmap2x[i].port_name[2], + pmap2x[i].port_name[1], + pmap2x[i].port_name[0]); + } } out_free: