diff options
author | bms <bms@FreeBSD.org> | 2006-09-23 16:26:31 +0000 |
---|---|---|
committer | bms <bms@FreeBSD.org> | 2006-09-23 16:26:31 +0000 |
commit | f6e5dafda977f33fc23ea4eaf46e8018231afeb3 (patch) | |
tree | 813acd9650d8ac45d6bb2e41d84ae1efe18dc34d /sys | |
parent | 2f0a02201d4138870fc8e30f35809b7c9e2c86ea (diff) | |
download | FreeBSD-src-f6e5dafda977f33fc23ea4eaf46e8018231afeb3.zip FreeBSD-src-f6e5dafda977f33fc23ea4eaf46e8018231afeb3.tar.gz |
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
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netinet/tcp_input.c | 2 | ||||
-rw-r--r-- | sys/netinet/tcp_reass.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2d0e8ca..e01a6f0 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 2d0e8ca..e01a6f0 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 } /* |