summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_syncache.c
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2008-12-15 21:50:54 +0000
committerbz <bz@FreeBSD.org>2008-12-15 21:50:54 +0000
commit03f6bb9dc9b98a515613b815d92f251d470edfeb (patch)
tree30c97711914bd53cfed83d5b45b42b5a723ba6b1 /sys/netinet/tcp_syncache.c
parentea29c11cdebf56f08c85084a4e99c193160a87b7 (diff)
downloadFreeBSD-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_syncache.c')
-rw-r--r--sys/netinet/tcp_syncache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 838fd52..0d1511a 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -708,8 +708,8 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m)
goto abort;
}
/* Override flowlabel from in6_pcbconnect. */
- inp->in6p_flowinfo &= ~IPV6_FLOWLABEL_MASK;
- inp->in6p_flowinfo |= sc->sc_flowlabel;
+ inp->inp_flow &= ~IPV6_FLOWLABEL_MASK;
+ inp->inp_flow |= sc->sc_flowlabel;
} else
#endif
{
@@ -994,7 +994,7 @@ _syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
#ifdef INET6
if (inc->inc_isipv6 &&
- (inp->in6p_flags & IN6P_AUTOFLOWLABEL))
+ (inp->inp_flags & IN6P_AUTOFLOWLABEL))
autoflowlabel = 1;
#endif
ip_ttl = inp->inp_ip_ttl;
@@ -1654,7 +1654,7 @@ syncookie_lookup(struct in_conninfo *inc, struct syncache_head *sch,
#ifdef INET6
if (inc->inc_isipv6) {
- if (sotoinpcb(so)->in6p_flags & IN6P_AUTOFLOWLABEL)
+ if (sotoinpcb(so)->inp_flags & IN6P_AUTOFLOWLABEL)
sc->sc_flowlabel = md5_buffer[1] & IPV6_FLOWLABEL_MASK;
} else
#endif
OpenPOWER on IntegriCloud