From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 14:08:24 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8E86440D
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 14:08:24 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7BF2323E9
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 14:08:24 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s74E8OSF045539
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 14:08:24 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s74E8OIN045509
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 14:08:24 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 4 Aug 2014 14:08:24 GMT
Message-Id: <201408041408.s74E8OIN045509@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271852 - soc2014/dpl/netmap-ipfwjit/extra/sys/sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 14:08:24 -0000

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;
 	}
 }