summaryrefslogtreecommitdiff
path: root/sys/netinet6/frag6.c
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-02-16 08:48:08 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-02-16 08:48:08 +0000
commit41cf0b2cea14664135034f692a0f422de8d6c48a (patch)
treedfab1939f7da2cba0c70e9fd04a148c81d49d6cf /sys/netinet6/frag6.c
parent3793560226b78fe3411906b53ec36e4292160f73 (diff)
sync whitespace/comment with kame. to help merge tasks
Diffstat (limited to 'sys/netinet6/frag6.c')
-rw-r--r--sys/netinet6/frag6.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 9074cf00705..334eb2fd37a 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,9 +1,10 @@
-/* $OpenBSD: frag6.c,v 1.6 2000/02/07 06:09:09 itojun Exp $ */
+/* $OpenBSD: frag6.c,v 1.7 2001/02/16 08:48:05 itojun Exp $ */
+/* $KAME: frag6.c,v 1.28 2000/12/12 10:54:06 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -15,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -97,7 +98,7 @@ frag6_init()
* the Fragmentable Part of the original packet.
* -> next header field is same for all fragments
*
- * reassembly rule (p21):
+ * reassembly rule (p21):
* The Next Header field of the last header of the Unfragmentable
* Part is obtained from the Next Header field of the first
* fragment's Fragment header.
@@ -182,7 +183,7 @@ frag6_input(mp, offp, proto)
/*
* check whether fragment packet's fragment length is
- * multiple of 8 octets.
+ * multiple of 8 octets.
* sizeof(struct ip6_frag) == 8
* sizeof(struct ip6_hdr) = 40
*/
@@ -216,7 +217,7 @@ frag6_input(mp, offp, proto)
/*
* Enforce upper bound on number of fragmented packets
- * for which we attempt reassembly;
+ * for which we attempt reassembly;
* If maxfrag is 0, never accept fragments.
* If maxfrag is -1, accept all fragments without limitation.
*/
@@ -590,7 +591,7 @@ frag6_deq(af6)
af6->ip6af_down->ip6af_up = af6->ip6af_up;
}
-void
+void
frag6_insque(new, old)
struct ip6q *new, *old;
{
@@ -609,7 +610,7 @@ frag6_remque(p6)
}
/*
- * IP timer processing;
+ * IPv6 reassembling timer processing;
* if a timer expires on a reassembly
* queue, discard it.
*/