]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
cxgbe/tom: decide whether to shove segments or not only if there is
authornp <np@FreeBSD.org>
Fri, 30 Oct 2015 01:18:07 +0000 (01:18 +0000)
committernp <np@FreeBSD.org>
Fri, 30 Oct 2015 01:18:07 +0000 (01:18 +0000)
payload to transmit.

MFC after: 1 week

sys/dev/cxgbe/tom/t4_cpl_io.c

index eb972d074612c745a82a59348bdcbb04fd474617..efd683bee8821b1a8e282cb5114cf8eda144b5b0 100644 (file)
@@ -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 */