aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2007-12-10 16:03:40 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2007-12-10 16:03:40 +0000
commitb48287a32a7d204f103ef0914834b44aaa5d8720 (patch)
treed4c0e803504e29a3a6160e8169936a6e216211ea /sys/netinet6
parenta1bad2e6dc96a416b0839937f571322137b82aa2 (diff)
downloadsrc-b48287a32a7d204f103ef0914834b44aaa5d8720.tar.gz
src-b48287a32a7d204f103ef0914834b44aaa5d8720.zip
Clean up VCS Ids.
Notes
Notes: svn path=/head/; revision=174510
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/dest6.c8
-rw-r--r--sys/netinet6/frag6.c8
-rw-r--r--sys/netinet6/icmp6.c8
-rw-r--r--sys/netinet6/in6.c8
-rw-r--r--sys/netinet6/in6.h6
-rw-r--r--sys/netinet6/in6_cksum.c8
-rw-r--r--sys/netinet6/in6_gif.c8
-rw-r--r--sys/netinet6/in6_gif.h6
-rw-r--r--sys/netinet6/in6_ifattach.c8
-rw-r--r--sys/netinet6/in6_ifattach.h6
-rw-r--r--sys/netinet6/in6_pcb.c7
-rw-r--r--sys/netinet6/in6_pcb.h5
-rw-r--r--sys/netinet6/in6_proto.c8
-rw-r--r--sys/netinet6/in6_rmx.c8
-rw-r--r--sys/netinet6/in6_src.c8
-rw-r--r--sys/netinet6/in6_var.h6
-rw-r--r--sys/netinet6/ip6_ecn.h6
-rw-r--r--sys/netinet6/ip6_forward.c8
-rw-r--r--sys/netinet6/ip6_id.c11
-rw-r--r--sys/netinet6/ip6_input.c8
-rw-r--r--sys/netinet6/ip6_ipsec.c5
-rw-r--r--sys/netinet6/ip6_ipsec.h2
-rw-r--r--sys/netinet6/ip6_mroute.c13
-rw-r--r--sys/netinet6/ip6_mroute.h6
-rw-r--r--sys/netinet6/ip6_output.c8
-rw-r--r--sys/netinet6/ip6_var.h6
-rw-r--r--sys/netinet6/ip6protosw.h8
-rw-r--r--sys/netinet6/mld6.c8
-rw-r--r--sys/netinet6/mld6_var.h6
-rw-r--r--sys/netinet6/nd6.c8
-rw-r--r--sys/netinet6/nd6.h6
-rw-r--r--sys/netinet6/nd6_nbr.c8
-rw-r--r--sys/netinet6/nd6_rtr.c8
-rw-r--r--sys/netinet6/pim6.h6
-rw-r--r--sys/netinet6/pim6_var.h12
-rw-r--r--sys/netinet6/raw_ip6.c5
-rw-r--r--sys/netinet6/raw_ip6.h6
-rw-r--r--sys/netinet6/route6.c8
-rw-r--r--sys/netinet6/scope6.c8
-rw-r--r--sys/netinet6/scope6_var.h6
-rw-r--r--sys/netinet6/sctp6_usrreq.c2
-rw-r--r--sys/netinet6/sctp6_var.h2
-rw-r--r--sys/netinet6/tcp6_var.h2
-rw-r--r--sys/netinet6/udp6_usrreq.c10
-rw-r--r--sys/netinet6/udp6_var.h3
45 files changed, 177 insertions, 134 deletions
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 5a8250130e98..fb508fc6aac3 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 8bb4fa9206a1..2dd8aaa43346 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 91f8be63a36a..c224663b6df5 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 5de94330fd5e..f66ddb4f8f7a 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)in.c 8.2 (Berkeley) 11/15/93
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index e2d05a010efb..db0ab11fc25a 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $
*/
/*-
@@ -59,6 +58,7 @@
* SUCH DAMAGE.
*
* @(#)in.h 8.3 (Berkeley) 1/3/94
+ * $FreeBSD$
*/
#ifndef __KAME_NETINET_IN_H_INCLUDED_
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index 864f51a82a68..b15dd147dcb4 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/systm.h>
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index b925e367d8b6..d05f8a346a63 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/in6_gif.h b/sys/netinet6/in6_gif.h
index 2834162c6c80..f952089806ec 100644
--- a/sys/netinet6/in6_gif.h
+++ b/sys/netinet6/in6_gif.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $
+ * $FreeBSD$
*/
#ifndef _NETINET6_IN6_GIF_H_
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 85ddd6a845c5..297c0cd4af8e 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h
index 77cc88f1be4d..441eb7552698 100644
--- a/sys/netinet6/in6_ifattach.h
+++ b/sys/netinet6/in6_ifattach.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $
+ * $FreeBSD$
*/
#ifndef _NETINET6_IN6_IFATTACH_H_
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index f21a0f67ee1e..db9a66644b40 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -29,6 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $
*/
/*-
@@ -62,6 +60,9 @@
* @(#)in_pcb.c 8.2 (Berkeley) 1/4/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index 832c755b7f86..211a8f97d18a 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_pcb.h,v 1.13 2001/02/06 09:16:53 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -29,6 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $KAME: in6_pcb.h,v 1.13 2001/02/06 09:16:53 itojun Exp $
*/
/*-
@@ -60,6 +58,7 @@
* SUCH DAMAGE.
*
* @(#)in_pcb.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD$
*/
#ifndef _NETINET6_IN6_PCB_H_
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 849c83e9070d..6a39d645ed13 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)in_proto.c 8.1 (Berkeley) 6/10/93
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 775699daae7c..59e109e81784 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_rmx.c,v 1.11 2001/07/26 06:53:16 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_rmx.c,v 1.11 2001/07/26 06:53:16 jinmei Exp $
*/
/*-
@@ -73,6 +72,9 @@
* indefinitely. See in6_rtqtimo() below for the exact mechanism.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index d83ffc2fccd2..76a412a9258e 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_src.c,v 1.132 2003/08/26 04:42:27 keiichi Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_src.c,v 1.132 2003/08/26 04:42:27 keiichi Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)in_pcb.c 8.2 (Berkeley) 1/4/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index ebfcaea1b5b0..c5642e2fdfb0 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: in6_var.h,v 1.56 2001/03/29 05:34:31 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: in6_var.h,v 1.56 2001/03/29 05:34:31 itojun Exp $
*/
/*-
@@ -59,6 +58,7 @@
* SUCH DAMAGE.
*
* @(#)in_var.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD$
*/
#ifndef _NETINET6_IN6_VAR_H_
diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h
index 8dcdbd1c581c..27d3f34dbd17 100644
--- a/sys/netinet6/ip6_ecn.h
+++ b/sys/netinet6/ip6_ecn.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $ */
-
/*-
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
@@ -29,7 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $
+ * $FreeBSD$
*/
+
/*
* ECN consideration on tunnel ingress/egress operation.
* http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 0f1ad8e705d3..e335be8191c2 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index c5507ffb671f..fa7bc64fb0da 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,7 +1,3 @@
-/* $KAME: ip6_id.c,v 1.13 2003/09/16 09:11:19 itojun Exp $ */
-/* $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */
-/* $FreeBSD$ */
-
/*-
* Copyright (C) 2003 WIDE Project.
* All rights reserved.
@@ -29,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_id.c,v 1.13 2003/09/16 09:11:19 itojun Exp $
*/
/*-
@@ -64,8 +62,13 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* seed = random (bits - 1) bit
* n = prime, g0 = generator to n,
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index eb7865767a6c..acf1d2d92d6d 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c
index 5e13241e5ddc..73b9efe6dba0 100644
--- a/sys/netinet6/ip6_ipsec.c
+++ b/sys/netinet6/ip6_ipsec.c
@@ -25,10 +25,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_ipsec.h"
#include <sys/param.h>
diff --git a/sys/netinet6/ip6_ipsec.h b/sys/netinet6/ip6_ipsec.h
index 2b5668dbae3e..a02481156a4e 100644
--- a/sys/netinet6/ip6_ipsec.h
+++ b/sys/netinet6/ip6_ipsec.h
@@ -37,5 +37,5 @@ int ip6_ipsec_fwd(struct mbuf *);
int ip6_ipsec_input(struct mbuf *, int);
int ip6_ipsec_mtu(struct mbuf *);
int ip6_ipsec_output(struct mbuf **, struct inpcb *, int *, int *,
- struct ifnet **, struct secpolicy **sp);
+ struct ifnet **, struct secpolicy **sp);
#endif
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 67b29b7ec1cc..a14882f6955f 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $ */
-
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -28,10 +25,10 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $
*/
-/* BSDI ip_mroute.c,v 2.10 1996/11/14 00:29:52 jch Exp */
-
/*-
* Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
@@ -64,7 +61,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)ip_mroute.c 8.2 (Berkeley) 11/15/93
+ * @(#)ip_mroute.c 8.2 (Berkeley) 11/15/93
+ * BSDI ip_mroute.c,v 2.10 1996/11/14 00:29:52 jch Exp
*/
/*
@@ -80,6 +78,9 @@
* MROUTING Revision: 3.5.1.2 + PIM-SMv2 (pimd) Support
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index ebdf8ac6fc1a..0e35e629498e 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $ */
-
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $
+ * $FreeBSD$
*/
/* BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp */
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 74cd41f0afcc..303028c8ef04 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $
*/
/*-
@@ -61,6 +60,9 @@
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index a01cf8a69b33..1d34bfe7b9c4 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $
*/
/*-
@@ -59,6 +58,7 @@
* SUCH DAMAGE.
*
* @(#)ip_var.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD$
*/
#ifndef _NETINET6_IP6_VAR_H_
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index a6bb6833e8a8..19689592a500 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -29,10 +26,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $
*/
-/* BSDI protosw.h,v 2.3 1996/10/11 16:02:40 pjd Exp */
-
/*-
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -62,6 +58,8 @@
* SUCH DAMAGE.
*
* @(#)protosw.h 8.1 (Berkeley) 6/2/93
+ * BSDI protosw.h,v 2.3 1996/10/11 16:02:40 pjd Exp
+ * $FreeBSD$
*/
#ifndef _NETINET6_IP6PROTOSW_H_
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index f7a63328fecc..e48a4970f489 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $ */
-
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $
*/
/*-
@@ -65,6 +64,9 @@
* @(#)igmp.c 8.1 (Berkeley) 7/19/93
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/mld6_var.h b/sys/netinet6/mld6_var.h
index a4e52f21f28c..4f51b99d462c 100644
--- a/sys/netinet6/mld6_var.h
+++ b/sys/netinet6/mld6_var.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $ */
-
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $
+ * $FreeBSD$
*/
#ifndef _NETINET6_MLD6_VAR_H_
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index d1fcd4fb691c..02140bc858c3 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_mac.h"
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 1d7262352228..8b932a93412f 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $
+ * $FreeBSD$
*/
#ifndef _NETINET6_ND6_H_
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 0572069b1b18..91a883a5905a 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 2a816029234f..831f81029c8d 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 25e2b2320f34..dec84cf2e625 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $ */
-
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $
+ * $FreeBSD$
*/
/*
* Protocol Independent Multicast (PIM) definitions
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index aa6fc6c3fa64..19d0e900e9cb 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $ */
-
/*-
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
@@ -28,11 +25,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $
+ * $FreeBSD$
*/
-#ifndef _NETINET6_PIM6_VAR_H_
-#define _NETINET6_PIM6_VAR_H_
-
/*
* Protocol Independent Multicast (PIM),
* implementation-specific definitions.
@@ -41,6 +38,9 @@
* Modified by Pavlin Ivanov Radoslavov, USC/ISI, May 1998
*/
+#ifndef _NETINET6_PIM6_VAR_H_
+#define _NETINET6_PIM6_VAR_H_
+
struct pim6stat {
u_quad_t pim6s_rcv_total; /* total PIM messages received */
u_quad_t pim6s_rcv_tooshort; /* received with too few bytes */
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 1256781a95ea..9353a7361ef9 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -25,8 +25,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/*-
@@ -60,6 +58,9 @@
* @(#)raw_ip.c 8.2 (Berkeley) 1/4/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_ipsec.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index 62aac14519f7..9ebd823cad23 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $ */
-
/*-
* Copyright (C) 2001 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $
+ * $FreeBSD$
*/
#ifndef _NETINET6_RAW_IP6_H_
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index 989de86e223a..e607bea4dcc3 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: route6.c,v 1.24 2001/03/14 03:07:05 itojun Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: route6.c,v 1.24 2001/03/14 03:07:05 itojun Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 50646ae2068c..881db7ec1267 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: scope6.c,v 1.10 2000/07/24 13:29:31 itojun Exp $ */
-
/*-
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: scope6.c,v 1.10 2000/07/24 13:29:31 itojun Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index 3dbdcd98f31b..55e0c8eda53b 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $ */
-
/*-
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $
+ * $FreeBSD$
*/
#ifndef _NETINET6_SCOPE6_VAR_H_
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 8b6c249c1b2e..0d972f468fb3 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -28,10 +28,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-
#include <netinet/sctp_os.h>
#include <sys/proc.h>
#include <netinet/sctp_pcb.h>
diff --git a/sys/netinet6/sctp6_var.h b/sys/netinet6/sctp6_var.h
index 3b744e32e330..6e8a95ee4091 100644
--- a/sys/netinet6/sctp6_var.h
+++ b/sys/netinet6/sctp6_var.h
@@ -28,8 +28,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
/* $KAME: sctp6_var.h,v 1.7 2004/08/17 04:06:22 itojun Exp $ */
+
#ifndef _NETINET6_SCTP6_VAR_H_
#define _NETINET6_SCTP6_VAR_H_
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h
index 68d8bfda5e86..f3611c2333f5 100644
--- a/sys/netinet6/tcp6_var.h
+++ b/sys/netinet6/tcp6_var.h
@@ -25,8 +25,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/*-
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index e9c732819432..96b72b21981a 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -1,6 +1,3 @@
-/* $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $ */
-/* $KAME: udp6_output.c,v 1.31 2001/05/21 16:39:15 jinmei Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,6 +25,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $
+ * $KAME: udp6_output.c,v 1.31 2001/05/21 16:39:15 jinmei Exp $
*/
/*-
@@ -60,9 +60,11 @@
* SUCH DAMAGE.
*
* @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipsec.h"
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index feee95e0e085..ae53c5a84fa9 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -25,8 +25,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/*-
@@ -59,6 +57,7 @@
* SUCH DAMAGE.
*
* @(#)udp_var.h 8.1 (Berkeley) 6/10/93
+ * $FreeBSD$
*/
#ifndef _NETINET6_UDP6_VAR_H_