From e9cf267187edb4e42a3c4f272a5d9d8db4c01993 Mon Sep 17 00:00:00 2001
From: np <np@FreeBSD.org>
Date: Sat, 8 Jun 2013 07:23:26 +0000
Subject: [PATCH] cxgbe/tom: Fix bad signed/unsigned mixup in the stid
 allocator.  This fixes a panic when allocating a mixture of IPv6 and IPv4
 stids.

MFC after:	1 week
---
 sys/dev/cxgbe/offload.h       | 4 ++--
 sys/dev/cxgbe/tom/t4_listen.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h
index 55ac71b54ef5..60907756f3a8 100644
--- a/sys/dev/cxgbe/offload.h
+++ b/sys/dev/cxgbe/offload.h
@@ -59,8 +59,8 @@ struct listen_ctx;
 
 struct stid_region {
 	TAILQ_ENTRY(stid_region) link;
-	int used;	/* # of stids used by this region */
-	int free;	/* # of contiguous stids free right after this region */
+	u_int used;	/* # of stids used by this region */
+	u_int free;	/* # of contiguous stids free right after this region */
 };
 
 /*
diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c
index aa76762435a5..7db4126366a3 100644
--- a/sys/dev/cxgbe/tom/t4_listen.c
+++ b/sys/dev/cxgbe/tom/t4_listen.c
@@ -125,7 +125,7 @@ alloc_stid(struct adapter *sc, struct listen_ctx *lctx, int isipv6)
 		TAILQ_FOREACH(s, &t->stids, link) {
 			stid += s->used + s->free;
 			f = stid & mask;
-			if (n <= s->free - f) {
+			if (s->free >= n + f) {
 				stid -= n + f;
 				s->free -= n + f;
 				TAILQ_INSERT_AFTER(&t->stids, s, sr, link);