PERFORCE change 113361 for review

[Todd Miller]

http://perforce.freebsd.org/chv.cgi?CH=113361

Change 113361 by millert at 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 */