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

Commit e1bf0d5e authored Feb 03, 2016 by Easwar Hariharan Committed by Doug Ledford Mar 10, 2016

staging/rdma/hfi1, IB/core: Fix LinkDownReason define for consistency



LinkDownReason LocalMediaNotInstalled lacked an underscore
and was inconsistent with other defines in the same family.
This patch fixes this.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

parent 45b59eef

drivers/staging/rdma/hfi1/chip.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5950,12 +5950,12 @@ static void handle_qsfp_int(struct hfi1_devdata *dd, u32 src_ctx, u64 reg)

	if ((ppd->offline_disabled_reason >		if ((ppd->offline_disabled_reason >
	HFI1_ODR_MASK(		HFI1_ODR_MASK(
	OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED)) \|\|		OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED)) \|\|
	(ppd->offline_disabled_reason ==		(ppd->offline_disabled_reason ==
	HFI1_ODR_MASK(OPA_LINKDOWN_REASON_NONE)))		HFI1_ODR_MASK(OPA_LINKDOWN_REASON_NONE)))
	ppd->offline_disabled_reason =		ppd->offline_disabled_reason =
	HFI1_ODR_MASK(		HFI1_ODR_MASK(
	OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED);		OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED);

	if (ppd->host_link_state == HLS_DN_POLL) {		if (ppd->host_link_state == HLS_DN_POLL) {
	/*		/*

drivers/staging/rdma/hfi1/platform.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -816,7 +816,7 @@ void tune_serdes(struct hfi1_pportdata *ppd)
	} else		} else
	ppd->offline_disabled_reason =		ppd->offline_disabled_reason =
	HFI1_ODR_MASK(		HFI1_ODR_MASK(
	OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED);		OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED);
	break;		break;
	default:		default:
	dd_dev_info(ppd->dd, "%s: Unknown port type\n", __func__);		dd_dev_info(ppd->dd, "%s: Unknown port type\n", __func__);

include/rdma/opa_port_info.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,7 @@
	#define OPA_LINKDOWN_REASON_WIDTH_POLICY 41		#define OPA_LINKDOWN_REASON_WIDTH_POLICY 41
	/* 42-48 reserved */		/* 42-48 reserved */
	#define OPA_LINKDOWN_REASON_DISCONNECTED 49		#define OPA_LINKDOWN_REASON_DISCONNECTED 49
	#define OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED 50		#define OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED 50
	#define OPA_LINKDOWN_REASON_NOT_INSTALLED 51		#define OPA_LINKDOWN_REASON_NOT_INSTALLED 51
	#define OPA_LINKDOWN_REASON_CHASSIS_CONFIG 52		#define OPA_LINKDOWN_REASON_CHASSIS_CONFIG 52
	/* 53 reserved */		/* 53 reserved */