diff options
| author | bz <bz@FreeBSD.org> | 2011-04-30 16:30:18 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-04-30 16:30:18 +0000 |
| commit | 2bac7bb27f6b7afd6ccb8626521301412bb23891 (patch) | |
| tree | a68a399b39a5b35e052c946639038ef38fc42a4d /sys/netinet/tcp_input.c | |
| parent | b1b8237ae64c284a1e46c433da189273b753b581 (diff) | |
| download | FreeBSD-src-2bac7bb27f6b7afd6ccb8626521301412bb23891.zip FreeBSD-src-2bac7bb27f6b7afd6ccb8626521301412bb23891.tar.gz | |
Fix a mismerge from p4 in that in_localaddr() is not available without INET.
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after: 4 days
Diffstat (limited to 'sys/netinet/tcp_input.c')
| -rw-r--r-- | sys/netinet/tcp_input.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 70c1522..71c3411 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -370,7 +370,11 @@ cc_conn_init(struct tcpcb *tp) else if (isipv6 && in6_localaddr(&inp->in6p_faddr)) tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local; #endif -#if defined(INET) || defined(INET6) +#if defined(INET) && defined(INET6) + else if (!isipv6 && in_localaddr(inp->inp_faddr)) + tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local; +#endif +#ifdef INET else if (in_localaddr(inp->inp_faddr)) tp->snd_cwnd = tp->t_maxseg * V_ss_fltsz_local; #endif |
