From f1edc3bde5ee43672c64104611d59c892998d5d2 Mon Sep 17 00:00:00 2001 From: Bruce M Simpson Date: Sat, 23 Sep 2006 16:26:31 +0000 Subject: Always set the IP version in the TCP input path, to preserve the header field for possible later IPSEC SPD lookup, even when the kernel is built without 'options INET6'. PR: kern/57760 MFC after: 1 week Submitted by: Joachim Schueth --- sys/netinet/tcp_input.c | 2 -- sys/netinet/tcp_reass.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2d0e8ca3ac63..e01a6f0778cc 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -548,10 +548,8 @@ tcp_input(m, off0) tcpstat.tcps_rcvbadsum++; goto drop; } -#ifdef INET6 /* Re-initialization for later version check */ ip->ip_v = IPVERSION; -#endif } /* diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 2d0e8ca3ac63..e01a6f0778cc 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -548,10 +548,8 @@ tcp_input(m, off0) tcpstat.tcps_rcvbadsum++; goto drop; } -#ifdef INET6 /* Re-initialization for later version check */ ip->ip_v = IPVERSION; -#endif } /* -- cgit v1.3