From 1d58d765253ab01a5e6ade468b101afc1a674c9b Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 03:42:47 +0000
Subject: [PATCH] Merge r7413 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7670 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 srpt/src/ib_srpt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index 322bb55cd..b64bcf5c3 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -2243,9 +2243,9 @@ retry:
 	 * max_sge values, use max_sge_delta.
 	 */
 	ch->max_sge = sdev->dev_attr.max_sge -
-		min(max_sge_delta,
-		    max_t(int, 0,
-			  sdev->dev_attr.max_sge - max_sge_delta));
+		min_t(unsigned, max_sge_delta,
+		      max_t(int, 0,
+			    sdev->dev_attr.max_sge - max_sge_delta));
 	qp_init->cap.max_send_sge = ch->max_sge;
 	qp_init->cap.max_recv_sge = ch->max_sge;
 	if (sdev->use_srq) {