Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90991c85 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Add support for fabric name FC transport attribute. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a740a3f0

drivers/scsi/qla2xxx/qla_attr.c

+16 −0
Original line number Diff line number Diff line
@@ -865,6 +865,20 @@ qla2x00_set_host_system_hostname(struct Scsi_Host *shost) 
	set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);

}



static void

qla2x00_get_host_fabric_name(struct Scsi_Host *shost)

{

	scsi_qla_host_t *ha = to_qla_host(shost);

	u64 node_name;



	if (ha->device_flags & SWITCH_FOUND)

		node_name = wwn_to_u64(ha->fabric_node_name);

	else

		node_name = wwn_to_u64(ha->node_name);



	fc_host_fabric_name(shost) = node_name;

}



struct fc_function_template qla2xxx_transport_functions = {



	.show_host_node_name = 1,
@@ -881,6 +895,8 @@ struct fc_function_template qla2xxx_transport_functions = { 
	.show_host_symbolic_name = 1,

	.set_host_system_hostname = qla2x00_set_host_system_hostname,

	.show_host_system_hostname = 1,

	.get_host_fabric_name = qla2x00_get_host_fabric_name,

	.show_host_fabric_name = 1,



	.dd_fcrport_size = sizeof(struct fc_port *),

	.show_rport_supported_classes = 1,

drivers/scsi/qla2xxx/qla_def.h

+1 −0
Original line number Diff line number Diff line
@@ -2362,6 +2362,7 @@ typedef struct scsi_qla_host { 


	uint8_t		*node_name;

	uint8_t		*port_name;

	uint8_t		fabric_node_name[WWN_SIZE];

	uint32_t    isp_abort_cnt;



	/* Option ROM information. */

drivers/scsi/qla2xxx/qla_init.c

+2 −1
Original line number Diff line number Diff line
@@ -2280,7 +2280,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha) 
		loop_id = NPH_F_PORT;

	else

		loop_id = SNS_FL_PORT;

	rval = qla2x00_get_port_name(ha, loop_id, NULL, 0);

	rval = qla2x00_get_port_name(ha, loop_id, ha->fabric_node_name, 1);

	if (rval != QLA_SUCCESS) {

		DEBUG2(printk("scsi(%ld): MBC_GET_PORT_NAME Failed, No FL "

		    "Port\n", ha->host_no));
@@ -2288,6 +2288,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha) 
		ha->device_flags &= ~SWITCH_FOUND;

		return (QLA_SUCCESS);

	}

	ha->device_flags |= SWITCH_FOUND;



	/* Mark devices that need re-synchronization. */

	rval2 = qla2x00_device_resync(ha);