d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation in case of defined(INET) && defined(IPFIREWALL_FORWARD)

Browse Source 
but no INET6.

Reported by:	avg
Tested by:	avg
MFC after:	4 weeks
X-MFC with:	r225044
Approved by:	re (kib)
This commit is contained in:
Bjoern A. Zeeb 2011-08-20 18:45:38 +00:00
parent 8a006adb24
commit 6f69742441
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet/tcp_input.c
View File

@ -581,9 +581,6 @@ tcp_input(struct mbuf *m, int off0)
int isipv6;
#else
const void *ip6 = NULL;
#if (defined(INET) && defined(IPFIREWALL_FORWARD)) || defined(TCPDEBUG)
const int isipv6 = 0;
#endif
#endif /* INET6 */
struct tcpopt to; /* options in this segment */
char *s = NULL; /* address and port logging */
@ -1028,11 +1025,11 @@ tcp_input(struct mbuf *m, int off0)
#ifdef TCPDEBUG
if (so->so_options & SO_DEBUG) {
ostate = tp->t_state;
if (isipv6) {
#ifdef INET6
if (isipv6) {
bcopy((char *)ip6, (char *)tcp_saveipgen, sizeof(*ip6));
#endif
} else
#endif
bcopy((char *)ip, (char *)tcp_saveipgen, sizeof(*ip));
tcp_savetcp = *th;
}