Date: Fri, 21 Nov 2008 04:41:53 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r185143 - user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys Message-ID: <200811210441.mAL4frTb074057@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Nov 21 04:41:53 2008 New Revision: 185143 URL: http://svn.freebsd.org/changeset/base/185143 Log: centralize free of mbuf tags Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c Fri Nov 21 04:38:20 2008 (r185142) +++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c Fri Nov 21 04:41:53 2008 (r185143) @@ -128,6 +128,8 @@ _mcl_collapse_mbuf(struct mbuf_iovec *mi #ifdef IFNET_MULTIQ mi->mi_rss_hash = m->m_pkthdr.rss_hash; #endif + if(!SLIST_EMPTY(&m->m_pkthdr.tags)) + m_tag_delete_chain(m, NULL); } if (m->m_type != MT_DATA) { mi->mi_data = NULL; @@ -201,9 +203,6 @@ busdma_map_sg_collapse(struct mbuf **m, KASSERT(n->m_pkthdr.len, ("packet has zero header len")); - if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) - m_tag_delete_chain(n, NULL); - if (n->m_pkthdr.len <= PIO_LEN) return (0); retry: @@ -319,9 +318,6 @@ busdma_map_sg_vec(struct mbuf **m, struc mv->mv_first = 0; for (mp = m, i = 0, mi = mv->mv_vec; i < pkt_count; mp++, segs++, mi++, i++) { - if ((*mp)->m_flags & M_PKTHDR - && !SLIST_EMPTY(&(*mp)->m_pkthdr.tags)) - m_tag_delete_chain(*mp, NULL); busdma_map_mbuf_fast(*mp, segs); _mcl_collapse_mbuf(mi, *mp); KASSERT(mi->mi_len, ("empty packet"));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811210441.mAL4frTb074057>