summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_usrreq.c
diff options
context:
space:
mode:
authorDavid Malone <dwmalone@FreeBSD.org>2004-08-14 15:32:40 +0000
committerDavid Malone <dwmalone@FreeBSD.org>2004-08-14 15:32:40 +0000
commit1f44b0a1b539198ce55bf97e73d51ded20a55ab4 (patch)
tree56a806b0847f95ede378bb97ce9bfcb595420ea2 /sys/netinet/tcp_usrreq.c
parente7581f0fc2b97703022b42069967a8cfca46e8a2 (diff)
Notes
Diffstat (limited to 'sys/netinet/tcp_usrreq.c')
-rw-r--r--sys/netinet/tcp_usrreq.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 1e961291e9fc..df6fa74f1fad 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -33,7 +33,6 @@
#include "opt_ipsec.h"
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_random_ip_id.h"
#include "opt_tcpdebug.h"
#include <sys/param.h>
@@ -946,12 +945,8 @@ tcp6_connect(tp, nam, td)
/* update flowinfo - draft-itojun-ipv6-flowlabel-api-00 */
inp->in6p_flowinfo &= ~IPV6_FLOWLABEL_MASK;
if (inp->in6p_flags & IN6P_AUTOFLOWLABEL)
- inp->in6p_flowinfo |=
-#ifdef RANDOM_IP_ID
+ inp->in6p_flowinfo |=
(htonl(ip6_randomflowlabel()) & IPV6_FLOWLABEL_MASK);
-#else
- (htonl(ip6_flow_seq++) & IPV6_FLOWLABEL_MASK);
-#endif
in_pcbrehash(inp);
/* Compute window scaling to request. */