From owner-svn-src-user@FreeBSD.ORG Thu Nov 22 15:38:09 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E1185A44; Thu, 22 Nov 2012 15:38:09 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C72048FC15; Thu, 22 Nov 2012 15:38:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMFc96v010773; Thu, 22 Nov 2012 15:38:09 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAMFc9sC010772; Thu, 22 Nov 2012 15:38:09 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201211221538.qAMFc9sC010772@svn.freebsd.org> From: Andre Oppermann Date: Thu, 22 Nov 2012 15:38:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r243406 - user/andre/tcp_workqueue/sys/sys X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2012 15:38:09 -0000 Author: andre Date: Thu Nov 22 15:38:09 2012 New Revision: 243406 URL: http://svnweb.freebsd.org/changeset/base/243406 Log: Move m_nextpkt pointer from m_hdr to m_pkthdr where it belongs. m_nextpkt is never valid unless M_PKTHDR is set. Modified: user/andre/tcp_workqueue/sys/sys/mbuf.h Modified: user/andre/tcp_workqueue/sys/sys/mbuf.h ============================================================================== --- user/andre/tcp_workqueue/sys/sys/mbuf.h Thu Nov 22 15:19:53 2012 (r243405) +++ user/andre/tcp_workqueue/sys/sys/mbuf.h Thu Nov 22 15:38:09 2012 (r243406) @@ -90,7 +90,6 @@ struct mb_args { */ struct m_hdr { struct mbuf *mh_next; /* next buffer in chain */ - struct mbuf *mh_nextpkt; /* next chain in queue/record */ caddr_t mh_data; /* location of data */ int mh_len; /* amount of data in this mbuf */ int mh_flags; /* flags; see below */ @@ -114,6 +113,7 @@ struct m_tag { */ struct pkthdr { struct ifnet *rcvif; /* rcv interface */ + struct mbuf *ph_nextpkt; /* next chain in queue/record */ /* variables for ip and tcp reassembly */ void *header; /* pointer to packet header */ int len; /* total packet length */ @@ -181,9 +181,9 @@ struct mbuf { #define m_data m_hdr.mh_data #define m_type m_hdr.mh_type #define m_flags m_hdr.mh_flags -#define m_nextpkt m_hdr.mh_nextpkt #define m_act m_nextpkt #define m_pkthdr M_dat.MH.MH_pkthdr +#define m_nextpkt M_dat.MH.MH_pkthdr.ph_nextpkt #define m_ext M_dat.MH.MH_dat.MH_ext #define m_pktdat M_dat.MH.MH_dat.MH_databuf #define m_dat M_dat.M_databuf