RDMA/rxe: Fixup rxe_icrc_hdr

rxe_icrc_hdr() in rxe_icrc.c is no longer shared. This patch makes it
static and changes the parameter list to match the other routines there.

Link: https://lore.kernel.org/r/20210707040040.15434-7-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_icrc.c b/drivers/infiniband/sw/rxe/rxe_icrc.c
index 00916440f17baec2bfac82dd08acb984203de38b..777199517e9a49f9753a79699aad7301a9789d60 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_icrc.c
+++ b/drivers/infiniband/sw/rxe/rxe_icrc.c
@@ -29,7 +29,7 @@ static u32 rxe_crc32(struct rxe_dev *rxe, u32 crc, void *next, size_t len)
 }
 
 /* Compute a partial ICRC for all the IB transport headers. */
-u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb)
+static u32 rxe_icrc_hdr(struct sk_buff *skb, struct rxe_pkt_info *pkt)
 {
        unsigned int bth_offset = 0;
        struct iphdr *ip4h = NULL;
@@ -106,7 +106,7 @@ int rxe_icrc_check(struct sk_buff *skb, struct rxe_pkt_info *pkt)
        icrcp = (__be32 *)(pkt->hdr + pkt->paylen - RXE_ICRC_SIZE);
        pkt_icrc = be32_to_cpu(*icrcp);
 
-       icrc = rxe_icrc_hdr(pkt, skb);
+       icrc = rxe_icrc_hdr(skb, pkt);
        icrc = rxe_crc32(pkt->rxe, icrc, (u8 *)payload_addr(pkt),
                                payload_size(pkt) + bth_pad(pkt));
        icrc = (__force u32)cpu_to_be32(~icrc);
@@ -134,7 +134,7 @@ void rxe_icrc_generate(struct sk_buff *skb, struct rxe_pkt_info *pkt)
        u32 icrc;
 
        icrcp = (__be32 *)(pkt->hdr + pkt->paylen - RXE_ICRC_SIZE);
-       icrc = rxe_icrc_hdr(pkt, skb);
+       icrc = rxe_icrc_hdr(skb, pkt);
        icrc = rxe_crc32(pkt->rxe, icrc, (u8 *)payload_addr(pkt),
                                payload_size(pkt) + bth_pad(pkt));
        *icrcp = (__force __be32)~icrc;

diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index a832535fa35a03e28be14f62e1a80b82ac712239..73a2c48a31602d1f76f6a15a1798ed323ab231e0 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -193,7 +193,6 @@ int rxe_requester(void *arg);
 int rxe_responder(void *arg);
 
 /* rxe_icrc.c */
-u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb);
 int rxe_icrc_check(struct sk_buff *skb, struct rxe_pkt_info *pkt);
 void rxe_icrc_generate(struct sk_buff *skb, struct rxe_pkt_info *pkt);