socsvn commit: r271852 - soc2014/dpl/netmap-ipfwjit/extra/sys/sys

[dpl at FreeBSD.org]

Author: dpl
Date: Mon Aug  4 14:08:23 2014
New Revision: 271852
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271852

Log:
  Fixed some issues with the mbuf.h file

Modified:
  soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h

Modified: soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h	Mon Aug  4 13:18:06 2014	(r271851)
+++ soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h	Mon Aug  4 14:08:23 2014	(r271852)
@@ -268,12 +268,11 @@
 m_gethdr(int how, short type)
 {
 	struct mbuf *m;
-	static const struct mbuf m0; /* zero-initialized */
 	
 	if (mbuf_freelist) {
 		m = mbuf_freelist;
 		mbuf_freelist = m->m_next;
-		*m = m0;
+		bzero(m, sizeof(struct mbuf));
 	} else {
 		m = (struct mbuf *)malloc(MY_MCLBYTES, M_IPFW, M_NOWAIT);
 	}
@@ -308,7 +307,7 @@
 	if (req_len < 0 || req_len > mp->m_len) {
 		D("no m_adj for len %d in mlen %d", req_len, mp->m_len);
 	} else {
-		mp->m_data += req_len;
+		mp->m_data = (char*)mp->m_data + req_len;
 		mp->m_len += req_len;
 	}
 }