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

Commit 4e1e93a4 authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/ipath: Trivial simplification of ipath_make_ud_req() 



Move the increment of s_hdrwords into the existing if block that tests 
if we're doing a send with immediate, to save one test of the opcode.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 950529e5

drivers/infiniband/hw/ipath/ipath_ud.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -301,8 +301,6 @@ int ipath_make_ud_req(struct ipath_qp *qp) 




	/* header size in 32-bit words LRH+BTH+DETH = (8+12+8)/4. */

	/* header size in 32-bit words LRH+BTH+DETH = (8+12+8)/4. */

	qp->s_hdrwords = 7;

	qp->s_hdrwords = 7;

	if (wqe->wr.opcode == IB_WR_SEND_WITH_IMM)

		qp->s_hdrwords++;

	qp->s_cur_size = wqe->length;

	qp->s_cur_size = wqe->length;

	qp->s_cur_sge = &qp->s_sge;

	qp->s_cur_sge = &qp->s_sge;

	qp->s_wqe = wqe;

	qp->s_wqe = wqe;
@@ -327,6 +325,7 @@ int ipath_make_ud_req(struct ipath_qp *qp) 
		ohdr = &qp->s_hdr.u.oth;

		ohdr = &qp->s_hdr.u.oth;

	}

	}

	if (wqe->wr.opcode == IB_WR_SEND_WITH_IMM) {

	if (wqe->wr.opcode == IB_WR_SEND_WITH_IMM) {

		qp->s_hdrwords++;

		ohdr->u.ud.imm_data = wqe->wr.imm_data;

		ohdr->u.ud.imm_data = wqe->wr.imm_data;

		bth0 = IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE << 24;

		bth0 = IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE << 24;

	} else

	} else