summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2004-10-18 03:59:35 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2004-10-18 03:59:35 +0000
commit2a6a6048d3513792218ebcc39e9cf08b1e62190e (patch)
tree2aeac7b3ce4d41f31ccf9058a8d2c0ef3d96e987
parent10be8d07882a7ed8dc61af6036d04cca961a3579 (diff)
g/c ip6_flow_seq. found by mcbride. mcbride ok
-rw-r--r--sys/netinet6/in6_proto.c3
-rw-r--r--sys/netinet6/ip6_input.c3
-rw-r--r--sys/netinet6/ip6_var.h3
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index bb5d9696dc9..3b28dda50ae 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_proto.c,v 1.44 2004/04/25 02:48:04 itojun Exp $ */
+/* $OpenBSD: in6_proto.c,v 1.45 2004/10/18 03:59:33 itojun Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -267,7 +267,6 @@ int ip6_maxfrags = 200;
int ip6_log_interval = 5;
int ip6_hdrnestlimit = 50; /* appropriate? */
int ip6_dad_count = 1; /* DupAddrDetectionTransmits */
-u_int32_t ip6_flow_seq;
int ip6_auto_flowlabel = 1;
int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
int ip6_rr_prune = 5; /* router renumbering prefix
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index ed270e8b788..3934624e34d 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_input.c,v 1.59 2004/06/21 19:26:02 mcbride Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.60 2004/10/18 03:59:34 itojun Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -151,7 +151,6 @@ ip6_init()
ip6intrq.ifq_maxlen = ip6qmaxlen;
nd6_init();
frag6_init();
- ip6_flow_seq = arc4random();
ip6_init2((void *)0);
}
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 9d27f7ca43d..ca27d05cf2c 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_var.h,v 1.24 2003/10/01 21:41:05 itojun Exp $ */
+/* $OpenBSD: ip6_var.h,v 1.25 2004/10/18 03:59:34 itojun Exp $ */
/* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */
/*
@@ -226,7 +226,6 @@ extern time_t ip6_log_time;
extern int ip6_hdrnestlimit; /* upper limit of # of extension headers */
extern int ip6_dad_count; /* DupAddrDetectionTransmits */
-extern u_int32_t ip6_flow_seq;
extern int ip6_auto_flowlabel;
extern int ip6_auto_linklocal;