git: f52bc34a0635 - stable/13 - Fix LINT kernel build issues after c3987b8ea793c11f61fecb14ef93195a23e3522c .

[Hans Petter Selasky]

The branch stable/13 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=f52bc34a0635c813080075f1d5383e03992e0ba4

commit f52bc34a0635c813080075f1d5383e03992e0ba4
Author:     Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2021-07-12 15:47:15 +0000
Commit:     Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2021-07-26 16:04:32 +0000

    Fix LINT kernel build issues after c3987b8ea793c11f61fecb14ef93195a23e3522c .
    
    Fixes the IPOIB_CM and SDP kernel options.
    
    Reported by:    lwhsu @
    Sponsored by:   NVIDIA Networking
    
    (cherry picked from commit 693ddf4dc4b9c1ffbe6373e186e1b121e3635f53)
---
 sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 ++++----
 sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c     | 2 +-
 sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c     | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index b61ebfd1495a..1e386a04d6d9 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -92,7 +92,7 @@ static void ipoib_cm_dma_unmap_rx(struct ipoib_dev_priv *priv, struct ipoib_cm_r
 
 static int ipoib_cm_post_receive_srq(struct ipoib_dev_priv *priv, int id)
 {
-	struct ib_recv_wr *bad_wr;
+	const struct ib_recv_wr *bad_wr;
 	struct ipoib_rx_buf *rx_req;
 	struct mbuf *m;
 	int ret;
@@ -124,7 +124,7 @@ static int ipoib_cm_post_receive_nonsrq(struct ipoib_dev_priv *priv,
 					struct ib_sge *sge, int id)
 {
 	struct ipoib_rx_buf *rx_req;
-	struct ib_recv_wr *bad_wr;
+	const struct ib_recv_wr *bad_wr;
 	struct mbuf *m;
 	int ret;
 	int i;
@@ -172,7 +172,7 @@ static void ipoib_cm_free_rx_ring(struct ipoib_dev_priv *priv,
 
 static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv *priv)
 {
-	struct ib_send_wr *bad_wr;
+	const struct ib_send_wr *bad_wr;
 	struct ipoib_cm_rx *p;
 
 	/* We only reserved 1 extra slot in CQ for drain WRs, so
@@ -600,7 +600,7 @@ static inline int post_send(struct ipoib_dev_priv *priv,
 			    struct ipoib_cm_tx_buf *tx_req,
 			    unsigned int wr_id)
 {
-	struct ib_send_wr *bad_wr;
+	const struct ib_send_wr *bad_wr;
 	struct mbuf *mb = tx_req->mb;
 	u64 *mapping = tx_req->mapping;
 	struct mbuf *m;
diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
index bb56e1c4d7d1..e20602a8d87c 100644
--- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -103,7 +103,7 @@ sdp_post_recv(struct sdp_sock *ssk)
 	struct ib_recv_wr rx_wr = { NULL };
 	struct ib_sge ibsge[SDP_MAX_RECV_SGES];
 	struct ib_sge *sge = ibsge;
-	struct ib_recv_wr *bad_wr;
+	const struct ib_recv_wr *bad_wr;
 	struct mbuf *mb, *m;
 	struct sdp_bsdh *h;
 	int id = ring_head(ssk->rx_ring);
diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
index 0d35759e4b71..64f42ed8d569 100644
--- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -69,7 +69,7 @@ sdp_post_send(struct sdp_sock *ssk, struct mbuf *mb)
 	struct sdp_bsdh *h;
 	unsigned long mseq;
 	struct ib_device *dev;
-	struct ib_send_wr *bad_wr;
+	const struct ib_send_wr *bad_wr;
 	struct ib_sge ibsge[SDP_MAX_SEND_SGES];
 	struct ib_sge *sge;
 	struct ib_send_wr tx_wr = { NULL };
@@ -390,7 +390,8 @@ void
 sdp_post_keepalive(struct sdp_sock *ssk)
 {
 	int rc;
-	struct ib_send_wr wr, *bad_wr;
+	struct ib_send_wr wr;
+	const struct ib_send_wr *bad_wr;
 
 	sdp_dbg(ssk->socket, "%s\n", __func__);