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

Commit 4608e4c8 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/hfi1: Use bool in process_ecn 



The process_ecn intends to return a bool value. However it is doing
so incorrectly by ANDing the fecn mask. The fecn bit is bit 31. Bool is
not a native data type and is up to the compiler to implement how it
sees fit. It is conceivable that this upper bit gets washed out.

Fix by converting to a bool properly.

Cc: stable@vger.kernel.org
Fixes: Commit fd2b562edca6 ("IB/hfi1: Pull FECN/BECN processing to a common place")
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 12220267

drivers/infiniband/hw/hfi1/hfi.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1660,7 +1660,7 @@ static inline bool process_ecn(struct rvt_qp *qp, struct hfi1_packet *pkt, 
	bth1 = be32_to_cpu(ohdr->bth[1]);

	bth1 = be32_to_cpu(ohdr->bth[1]);

	if (unlikely(bth1 & (IB_BECN_SMASK | IB_FECN_SMASK))) {

	if (unlikely(bth1 & (IB_BECN_SMASK | IB_FECN_SMASK))) {

		hfi1_process_ecn_slowpath(qp, pkt, do_cnp);

		hfi1_process_ecn_slowpath(qp, pkt, do_cnp);

		return bth1 & IB_FECN_SMASK;

		return !!(bth1 & IB_FECN_SMASK);

	}

	}

	return false;

	return false;

}

}

drivers/infiniband/hw/hfi1/rc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1930,7 +1930,8 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 
	int diff;

	int diff;

	struct ib_reth *reth;

	struct ib_reth *reth;

	unsigned long flags;

	unsigned long flags;

	int ret, is_fecn = 0;

	int ret;

	bool is_fecn = false;

	bool copy_last = false;

	bool copy_last = false;

	u32 rkey;

	u32 rkey;