Date: Fri, 5 Jun 2009 22:36:17 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193540 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb Message-ID: <200906052236.n55MaHAA040167@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Jun 5 22:36:17 2009 New Revision: 193540 URL: http://svn.freebsd.org/changeset/base/193540 Log: - assert that we're given a packet header - tso_info can only apply to a packet chain when count is 1 Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Fri Jun 5 22:23:33 2009 (r193539) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Fri Jun 5 22:36:17 2009 (r193540) @@ -1308,11 +1308,11 @@ t3_encap(struct sge_qset *qs, struct mbu mtx_assert(&qs->lock, MA_OWNED); cntrl = V_TXPKT_INTF(pi->txpkt_intf); -/* - * XXX need to add VLAN support for 6.x - */ + KASSERT(m0->m_flags & M_PKTHDR, ("not packet header\n")); + #ifdef VLAN_SUPPORTED - if (m0->m_pkthdr.csum_flags & (CSUM_TSO)) + if (count == 1 && m0->m_next != NULL && + m0->m_pkthdr.csum_flags & (CSUM_TSO)) tso_info = V_LSO_MSS(m0->m_pkthdr.tso_segsz); #endif if (count > 1) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906052236.n55MaHAA040167>