svn commit: r185536 - head/sys/dev/cxgb/sys

Kip Macy kmacy at FreeBSD.org
Mon Dec 1 16:48:08 PST 2008


Author: kmacy
Date: Tue Dec  2 00:48:08 2008
New Revision: 185536
URL: http://svn.freebsd.org/changeset/base/185536

Log:
  - fix multiqueue conditional
  - don't leak mbuf tags in the non-conditional case
  
  Found by: Navdeep Parhar

Modified:
  head/sys/dev/cxgb/sys/uipc_mvec.c

Modified: head/sys/dev/cxgb/sys/uipc_mvec.c
==============================================================================
--- head/sys/dev/cxgb/sys/uipc_mvec.c	Tue Dec  2 00:39:50 2008	(r185535)
+++ head/sys/dev/cxgb/sys/uipc_mvec.c	Tue Dec  2 00:48:08 2008	(r185536)
@@ -124,11 +124,11 @@ _mcl_collapse_mbuf(struct mbuf_iovec *mi
 	if (m->m_flags & M_PKTHDR) {
 		mi->mi_ether_vtag = m->m_pkthdr.ether_vtag;
 		mi->mi_tso_segsz = m->m_pkthdr.tso_segsz;
-#ifdef IFNET_MULTIQ		
+#ifdef IFNET_MULTIQUEUE		
 		mi->mi_rss_hash = m->m_pkthdr.rss_hash;
+#endif		
 		if(!SLIST_EMPTY(&m->m_pkthdr.tags)) 
 			m_tag_delete_chain(m, NULL);
-#endif		
 	}
 	if (m->m_type != MT_DATA) {
 		mi->mi_data = NULL;


More information about the svn-src-head mailing list