diff options
| author | itojun <itojun@FreeBSD.org> | 2000-07-04 16:35:15 +0000 |
|---|---|---|
| committer | itojun <itojun@FreeBSD.org> | 2000-07-04 16:35:15 +0000 |
| commit | 5f4e854de19331a53788d6100bbcd42845056bc1 (patch) | |
| tree | 3ff8c876a5868b103fb8713055d83e29a3fa38d5 /sys/netinet/tcp_reass.c | |
| parent | bdc16885232d771a99d7dfc247cd27a44cd061f9 (diff) | |
| download | FreeBSD-src-5f4e854de19331a53788d6100bbcd42845056bc1.zip FreeBSD-src-5f4e854de19331a53788d6100bbcd42845056bc1.tar.gz | |
sync with kame tree as of july00. tons of bug fixes/improvements.
API changes:
- additional IPv6 ioctls
- IPsec PF_KEY API was changed, it is mandatory to upgrade setkey(8).
(also syntax change)
Diffstat (limited to 'sys/netinet/tcp_reass.c')
| -rw-r--r-- | sys/netinet/tcp_reass.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 28fb89e..9cdff6a 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -60,22 +60,18 @@ #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#include <netinet/ip_icmp.h> -#ifdef INET6 -#include <netinet/ip6.h> +#include <netinet/ip_icmp.h> /* for ICMP_BANDLIM */ #include <netinet/in_var.h> -#include <netinet6/nd6.h> -#include <netinet/icmp6.h> -#endif +#include <netinet/icmp_var.h> /* for ICMP_BANDLIM */ #include <netinet/in_pcb.h> -#ifdef INET6 -#include <netinet6/in6_pcb.h> -#endif #include <netinet/ip_var.h> #ifdef INET6 +#include <netinet/ip6.h> +#include <netinet/icmp6.h> +#include <netinet6/nd6.h> #include <netinet6/ip6_var.h> +#include <netinet6/in6_pcb.h> #endif -#include <netinet/icmp_var.h> #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> @@ -157,7 +153,7 @@ do { \ if ((tp) && (tp)->t_inpcb && \ ((tp)->t_inpcb->inp_vflag & INP_IPV6) != 0 && \ (tp)->t_inpcb->in6p_route.ro_rt) \ - nd6_nud_hint((tp)->t_inpcb->in6p_route.ro_rt, NULL); \ + nd6_nud_hint((tp)->t_inpcb->in6p_route.ro_rt, NULL, 0); \ } while (0) #else #define ND6_HINT(tp) |
