From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 16:22:24 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 257B416A40F for ; Mon, 22 Jan 2007 16:22:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 8F5E813C45B for ; Mon, 22 Jan 2007 16:22:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 508C048D5D for ; Mon, 22 Jan 2007 11:22:19 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id E2E3F91B3E; Mon, 22 Jan 2007 16:22:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DACA516A409; Mon, 22 Jan 2007 16:22:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B694E16A406 for ; Mon, 22 Jan 2007 16:22:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A4F9D13C4A6 for ; Mon, 22 Jan 2007 16:22:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MGMG1Q030935 for ; Mon, 22 Jan 2007 16:22:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGMGWB030926 for perforce@freebsd.org; Mon, 22 Jan 2007 16:22:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:22:16 GMT Message-Id: <200701221622.l0MGMGWB030926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113361 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 16:22:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113361 Change 113361 by millert@millert_macbook on 2007/01/22 16:21:45 Include the label pointer regardless of whether or not MAC is defined so the structs are always the same size. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#5 (text+ko) ==== @@ -116,6 +116,7 @@ * stable. */ struct icmp6_filter; +struct label; struct inpcb { LIST_ENTRY(inpcb) inp_hash; /* hash list */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#5 (text+ko) ==== @@ -84,6 +84,7 @@ }; #ifdef KERNEL_PRIVATE +struct label; /* * Ip reassembly queue structure. Each fragment * being reassembled is attached to one of these structures. @@ -99,10 +100,7 @@ struct in_addr ipq_src,ipq_dst; u_long ipq_nfrags; TAILQ_ENTRY(ipq) ipq_list; - u_long reserved[1]; /* for future use */ -#ifdef MAC struct label *ipq_label; /* MAC label */ -#endif #if IPDIVERT #ifdef IPDIVERT_44 u_int32_t ipq_div_info; /* ipfw divert port & flags */