From: np <np@FreeBSD.org>
Date: Fri, 30 Oct 2015 01:18:07 +0000 (+0000)
Subject: cxgbe/tom: decide whether to shove segments or not only if there is
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=949e84b266cc7b3ae7f1c83e09223981fe6a0f0b;p=people%2Fjulieng%2Ffreebsd.git

cxgbe/tom: decide whether to shove segments or not only if there is
payload to transmit.

MFC after:	1 week
---

diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index eb972d074612..efd683bee882 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -675,7 +675,6 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
 			}
 		}
 
-		shove = m == NULL && !(tp->t_flags & TF_MORETOCOME);
 		space = sbspace(sb);
 
 		if (space <= sb->sb_hiwat * 3 / 8 &&
@@ -712,6 +711,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
 		if (__predict_false(toep->flags & TPF_FIN_SENT))
 			panic("%s: excess tx.", __func__);
 
+		shove = m == NULL && !(tp->t_flags & TF_MORETOCOME);
 		if (plen <= max_imm) {
 
 			/* Immediate data tx */