aboutsummaryrefslogtreecommitdiff
path: root/sys/net/if_gif.c
diff options
context:
space:
mode:
authorSUZUKI Shinsuke <suz@FreeBSD.org>2002-04-19 04:46:24 +0000
committerSUZUKI Shinsuke <suz@FreeBSD.org>2002-04-19 04:46:24 +0000
commit88ff5695c1e53c3398142ea10e3f041ff4b5a03f (patch)
tree100274bd96d0c95cafbe1a4a5961b54fc403fd47 /sys/net/if_gif.c
parent835284be37aa0e516f78172b951436a2aeddfabd (diff)
downloadsrc-88ff5695c1e53c3398142ea10e3f041ff4b5a03f.tar.gz
src-88ff5695c1e53c3398142ea10e3f041ff4b5a03f.zip
just merged cosmetic changes from KAME to ease sync between KAME and FreeBSD.
(based on freebsd4-snap-20020128) Reviewed by: ume MFC after: 1 week
Notes
Notes: svn path=/head/; revision=95023
Diffstat (limited to 'sys/net/if_gif.c')
-rw-r--r--sys/net/if_gif.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index aa8b96a7d5b9..6af98ce51839 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/* $KAME: if_gif.c,v 1.47 2001/05/01 05:28:42 itojun Exp $ */
+/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -129,7 +129,7 @@ SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0,
* Since, setting a large value to this macro with a careless configuration
* may introduce system crash, we don't allow any nestings by default.
* If you need to configure nested gif tunnels, you can define this macro
- * in your kernel configuration file. However, if you do so, please be
+ * in your kernel configuration file. However, if you do so, please be
* careful to configure the tunnels so that it won't make a loop.
*/
#define MAX_GIF_NEST 1
@@ -459,13 +459,12 @@ gif_input(m, af, gifp)
* Put the packet to the network layer input queue according to the
* specified address family.
* Note: older versions of gif_input directly called network layer
- * input functions, e.g. ip6_input, here. We changed the policy to
+ * input functions, e.g. ip6_input, here. We changed the policy to
* prevent too many recursive calls of such input functions, which
- * might cause kernel panic. But the change may introduce another
+ * might cause kernel panic. But the change may introduce another
* problem; if the input queue is full, packets are discarded.
- * We believed it rarely occurs and changed the policy. If we find
- * it occurs more times than we thought, we may change the policy
- * again.
+ * The kernel stack overflow really happened, and we believed
+ * queue-full rarely occurs, so we changed the policy.
*/
switch (af) {
#ifdef INET