Skip to contentSkip to conversation

RDMA/rxe: Fix typo: replace paylen by payload

PATCH Applied Bob Pearson 2 participants 2 messages Apr 20, 2022 – May 4, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/rxe: Fix typo: replace paylen by payload

In finish_packet() in rxe_req.c a variable was incorrectly called paylen instead of payload. Elsewhere in the rxe source payload is always used for the RoCE payload length and paylen is always used for the UDP payload length. This will cause unnecessary confusion.

Replace paylen by payload in finish_packet().

Fixes 63221acb0c631 ("RDMA/rxe: Fix ref error in rxe_av.c")
---
 drivers/infiniband/sw/rxe/rxe_req.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/infiniband/sw/rxe/rxe_req.c +6 -6
index e2659663b283..9bb24b824968 100644
@@ -435,7 +435,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
 
 static int finish_packet(struct rxe_qp *qp, struct rxe_av *av,
 			 struct rxe_send_wqe *wqe, struct rxe_pkt_info *pkt,
-			 struct sk_buff *skb, u32 paylen)
+			 struct sk_buff *skb, u32 payload)
 {
 	int err;
 
@@ -447,19 +447,19 @@ static int finish_packet(struct rxe_qp *qp, struct rxe_av *av,
 		if (wqe->wr.send_flags & IB_SEND_INLINE) {
 			u8 *tmp = &wqe->dma.inline_data[wqe->dma.sge_offset];
 
-			memcpy(payload_addr(pkt), tmp, paylen);
+			memcpy(payload_addr(pkt), tmp, payload);
 
-			wqe->dma.resid -= paylen;
-			wqe->dma.sge_offset += paylen;
+			wqe->dma.resid -= payload;
+			wqe->dma.sge_offset += payload;
 		} else {
 			err = copy_data(qp->pd, 0, &wqe->dma,
-					payload_addr(pkt), paylen,
+					payload_addr(pkt), payload,
 					RXE_FROM_MR_OBJ);
 			if (err)
 				return err;
 		}
 		if (bth_pad(pkt)) {
-			u8 *pad = payload_addr(pkt) + paylen;
+			u8 *pad = payload_addr(pkt) + payload;
 
 			memset(pad, 0, bth_pad(pkt));
 		}

base-commit: b5a93e79df64c32814f0edefdb920b540cbc986a

Signature · 1 line
2.32.0
maintainer Applied
#1 lore raw
Quoted 5 lines · Bob Pearson

In finish_packet() in rxe_req.c a variable was incorrectly called paylen instead of payload. Elsewhere in the rxe source payload is always used for the RoCE payload length and paylen is always used for the UDP payload length. This will cause unnecessary confusion.

Quoted 7 lines

Replace paylen by payload in finish_packet().

Fixes 63221acb0c631 ("RDMA/rxe: Fix ref error in rxe_av.c")
---
 drivers/infiniband/sw/rxe/rxe_req.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Applied to for-next, thanks

Jason