Date: Sun, 21 Sep 2008 21:17:10 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 150236 for review Message-ID: <200809212117.m8LLHA93086660@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150236 Change 150236 by ed@ed_dull on 2008/09/21 21:16:26 IFC, so I can generate proper diffs again. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#22 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#8 integrate Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.21 2008/09/04 16:39:02 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.22 2008/09/21 19:24:15 ed Exp $"); #include "opt_tty.h" ==== //depot/projects/mpsafetty/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.116 2008/09/14 06:14:06 rik Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.117 2008/09/21 20:42:42 rik Exp $ */ #ifndef _IPFW2_H @@ -37,6 +37,12 @@ #define IPFW_DEFAULT_RULE 65535 /* + * The number of ipfw tables. The maximum allowed table number is the + * (IPFW_TABLES_MAX - 1). + */ +#define IPFW_TABLES_MAX 128 + +/* * The kernel representation of ipfw rules is made of a list of * 'instructions' (for all practical purposes equivalent to BPF * instructions), which specify which fields of the packet @@ -640,7 +646,6 @@ #ifdef IPFW_INTERNAL -#define IPFW_TABLES_MAX 128 struct ip_fw_chain { struct ip_fw *rules; /* list of rules */ struct ip_fw *reap; /* list of rules to reap */ ==== //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#8 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.38 2008/09/07 14:32:03 simon Exp $ +# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.39 2008/09/21 18:02:00 simon Exp $ # set -e @@ -750,4 +750,4 @@ fi last_orders -echo "# NanoBSD image completed" +echo "# NanoBSD image ${NANO_NAME} completed"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809212117.m8LLHA93086660>