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

Commit b99570dd authored May 09, 2012 by James Smart Committed by James Bottomley May 17, 2012

[SCSI] lpfc 8.3.31: Fix bug with driver not supporting the get controller attributes command



Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 8a9d2e80

drivers/scsi/lpfc/lpfc_bsg.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************		/*******************************************************************
	* This file is part of the Emulex Linux Device Driver for *		* This file is part of the Emulex Linux Device Driver for *
	* Fibre Channel Host Bus Adapters. *		* Fibre Channel Host Bus Adapters. *
	* Copyright (C) 2009-2011 Emulex. All rights reserved. *		* Copyright (C) 2009-2012 Emulex. All rights reserved. *
	* EMULEX and SLI are trademarks of Emulex. *		* EMULEX and SLI are trademarks of Emulex. *
	* www.emulex.com *		* www.emulex.com *
	* *		* *
	@@ -3978,6 +3978,7 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba phba, struct fc_bsg_job job,
	} else if (subsys == SLI_CONFIG_SUBSYS_COMN) {		} else if (subsys == SLI_CONFIG_SUBSYS_COMN) {
	switch (opcode) {		switch (opcode) {
	case COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES:		case COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES:
			case COMN_OPCODE_GET_CNTL_ATTRIBUTES:
	lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,		lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
	"3106 Handled SLI_CONFIG "		"3106 Handled SLI_CONFIG "
	"subsys_comn, opcode:x%x\n",		"subsys_comn, opcode:x%x\n",

drivers/scsi/lpfc/lpfc_bsg.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************		/*******************************************************************
	* This file is part of the Emulex Linux Device Driver for *		* This file is part of the Emulex Linux Device Driver for *
	* Fibre Channel Host Bus Adapters. *		* Fibre Channel Host Bus Adapters. *
	* Copyright (C) 2010 Emulex. All rights reserved. *		* Copyright (C) 2010-2012 Emulex. All rights reserved. *
	* EMULEX and SLI are trademarks of Emulex. *		* EMULEX and SLI are trademarks of Emulex. *
	* www.emulex.com *		* www.emulex.com *
	* *		* *
	@@ -249,6 +249,7 @@ struct lpfc_sli_config_emb1_subsys {
	#define COMN_OPCODE_READ_OBJECT_LIST 0xAD		#define COMN_OPCODE_READ_OBJECT_LIST 0xAD
	#define COMN_OPCODE_DELETE_OBJECT 0xAE		#define COMN_OPCODE_DELETE_OBJECT 0xAE
	#define COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES 0x79		#define COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES 0x79
			#define COMN_OPCODE_GET_CNTL_ATTRIBUTES 0x20
	uint32_t timeout;		uint32_t timeout;
	uint32_t request_length;		uint32_t request_length;
	uint32_t word9;		uint32_t word9;