From owner-svn-src-projects@FreeBSD.ORG  Thu Dec  6 00:13:58 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A3D5C108;
 Thu,  6 Dec 2012 00:13:58 +0000 (UTC)
 (envelope-from jkim@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 6FB818FC12;
 Thu,  6 Dec 2012 00:13:58 +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 qB60Dw81016527;
 Thu, 6 Dec 2012 00:13:58 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB60Dw4i016526;
 Thu, 6 Dec 2012 00:13:58 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201212060013.qB60Dw4i016526@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 6 Dec 2012 00:13:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243921 - projects/bpfjit/sys/net
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2012 00:13:58 -0000

Author: jkim
Date: Thu Dec  6 00:13:57 2012
New Revision: 243921
URL: http://svnweb.freebsd.org/changeset/base/243921

Log:
  Add m_xbyte() and make m_xhalf(), m_xword(), and m_xbyte() global.  These
  functions are used by bpfjit.c later.  While I am here, make it compilable
  again in userland (broken in r224044).

Modified:
  projects/bpfjit/sys/net/bpf_filter.c

Modified: projects/bpfjit/sys/net/bpf_filter.c
==============================================================================
--- projects/bpfjit/sys/net/bpf_filter.c	Thu Dec  6 00:06:15 2012	(r243920)
+++ projects/bpfjit/sys/net/bpf_filter.c	Thu Dec  6 00:13:57 2012	(r243921)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #else
 #include <stdlib.h>
+#include <strings.h>
 #endif
 #include <net/bpf.h>
 #ifdef _KERNEL
@@ -82,11 +83,12 @@ __FBSDID("$FreeBSD$");
 	} \
 }
 
-static u_int16_t	m_xhalf(struct mbuf *m, bpf_u_int32 k, int *err);
-static u_int32_t	m_xword(struct mbuf *m, bpf_u_int32 k, int *err);
+uint32_t	m_xhalf(const struct mbuf *, uint32_t, int *);
+uint32_t	m_xword(const struct mbuf *, uint32_t, int *);
+uint32_t	m_xbyte(const struct mbuf *, uint32_t, int *);
 
-static u_int32_t
-m_xword(struct mbuf *m, bpf_u_int32 k, int *err)
+uint32_t
+m_xword(const struct mbuf *m, uint32_t k, int *err)
 {
 	size_t len;
 	u_char *cp, *np;
@@ -134,8 +136,8 @@ m_xword(struct mbuf *m, bpf_u_int32 k, i
 	return (0);
 }
 
-static u_int16_t
-m_xhalf(struct mbuf *m, bpf_u_int32 k, int *err)
+uint32_t
+m_xhalf(const struct mbuf *m, uint32_t k, int *err)
 {
 	size_t len;
 	u_char *cp;
@@ -163,6 +165,15 @@ m_xhalf(struct mbuf *m, bpf_u_int32 k, i
 	*err = 1;
 	return (0);
 }
+
+uint32_t
+m_xbyte(const struct mbuf *m, uint32_t k, int *err)
+{
+
+	*err = 0;
+	MINDEX(m, k);
+	return (mtod(m, u_char *)[k]);
+}
 #endif
 
 /*