diff options
| author | bz <bz@FreeBSD.org> | 2008-12-15 21:50:54 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2008-12-15 21:50:54 +0000 |
| commit | 03f6bb9dc9b98a515613b815d92f251d470edfeb (patch) | |
| tree | 30c97711914bd53cfed83d5b45b42b5a723ba6b1 /sys/netinet/tcp_subr.c | |
| parent | ea29c11cdebf56f08c85084a4e99c193160a87b7 (diff) | |
| download | FreeBSD-src-03f6bb9dc9b98a515613b815d92f251d470edfeb.zip FreeBSD-src-03f6bb9dc9b98a515613b815d92f251d470edfeb.tar.gz | |
Another step assimilating IPv[46] PCB code - directly use
the inpcb names rather than the following IPv6 compat macros:
in6pcb,in6p_sp, in6p_ip6_nxt,in6p_flowinfo,in6p_vflag,
in6p_flags,in6p_socket,in6p_lport,in6p_fport,in6p_ppcb and
sotoin6pcb().
Apart from removing duplicate code in netipsec, this is a pure
whitespace, not a functional change.
Discussed with: rwatson
Reviewed by: rwatson (version before review requested changes)
MFC after: 4 weeks (set the timer and see then)
Diffstat (limited to 'sys/netinet/tcp_subr.c')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index e7a6dff..2c22132 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -434,7 +434,7 @@ tcpip_fillheaders(struct inpcb *inp, void *ip_ptr, void *tcp_ptr) ip6 = (struct ip6_hdr *)ip_ptr; ip6->ip6_flow = (ip6->ip6_flow & ~IPV6_FLOWINFO_MASK) | - (inp->in6p_flowinfo & IPV6_FLOWINFO_MASK); + (inp->inp_flow & IPV6_FLOWINFO_MASK); ip6->ip6_vfc = (ip6->ip6_vfc & ~IPV6_VERSION_MASK) | (IPV6_VERSION & IPV6_VERSION_MASK); ip6->ip6_nxt = IPPROTO_TCP; |
