Date: Tue, 12 Sep 2006 05:07:35 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 106001 for review Message-ID: <200609120507.k8C57Z9Q068232@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=106001 Change 106001 by mjacob@newisp on 2006/09/12 05:06:35 Integrate em change. Affected files ... .. //depot/projects/newisp/dev/em/if_em.c#6 integrate Differences ... ==== //depot/projects/newisp/dev/em/if_em.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.143 2006/09/10 19:23:27 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.144 2006/09/11 20:59:01 pdeuskar Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1516,8 +1516,10 @@ */ if (do_tso && (m_head->m_len <= M_TSO_LEN)) { m_head = m_pullup(m_head, M_TSO_LEN + 4); - if (m_head == NULL) + *m_headp = m_head; + if (m_head == NULL) { return (ENOBUFS); + } } /* @@ -1578,7 +1580,7 @@ /* Do hardware assists */ m_head = *m_headp; - if ( ifp->if_hwassist > 0) { + if (ifp->if_hwassist > 0) { if (em_tso_setup(adapter, m_head, &txd_upper, &txd_lower)) { /* we need to make a final sentinel transmit desc */ tso_desc = TRUE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609120507.k8C57Z9Q068232>