Module Name: src
Committed By: dyoung
Date: Tue May 3 23:57:41 UTC 2011
Modified Files:
src/sys/netinet: tcp_vtw.h
Log Message:
Remove #ifdef INET6 throughout.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/tcp_vtw.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_vtw.h
diff -u src/sys/netinet/tcp_vtw.h:1.1 src/sys/netinet/tcp_vtw.h:1.2
--- src/sys/netinet/tcp_vtw.h:1.1 Tue May 3 18:28:45 2011
+++ src/sys/netinet/tcp_vtw.h Tue May 3 23:57:41 2011
@@ -360,21 +360,17 @@
int vtw_lookup_v4(const struct ip *ip, const struct tcphdr *th,
uint32_t faddr, uint16_t fport,
uint32_t laddr, uint16_t lport);
-#ifdef INET6
struct ip6_hdr;
struct in6_addr;
int vtw_lookup_v6(const struct ip6_hdr *ip, const struct tcphdr *th,
const struct in6_addr *faddr, uint16_t fport,
const struct in6_addr *laddr, uint16_t lport);
-#endif
typedef struct vestigial_inpcb {
union {
struct in_addr v4;
-#ifdef INET6
struct in6_addr v6;
-#endif
} faddr, laddr;
uint16_t fport, lport;
uint32_t valid : 1;
@@ -401,9 +397,7 @@
uint16_t sin_port;
union {
struct in_addr v4;
-#ifdef INET6
struct in6_addr v6;
-#endif
} sin_addr;
} sin_either_t;