--- a/usr/src/common/ipf/ip_compat.h	Thu Mar 23 19:49:27 2006 -0800
+++ b/usr/src/common/ipf/ip_compat.h	Fri Mar 24 12:29:20 2006 -0800
@@ -1,9 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
 /*
  * Copyright (C) 1999-2001, 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1305,6 +1325,7 @@
 #undef	IPOPT_LSRR
 #define	IPOPT_LSRR	131
 #define	IPOPT_E_SEC	133	/* E-SEC */
+#undef	IPOPT_CIPSO
 #define	IPOPT_CIPSO	134	/* CIPSO */
 #undef	IPOPT_SATID
 #define	IPOPT_SATID	136