Date: Sat, 30 Apr 2011 16:30:18 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221264 - head/sys/netinet Message-ID: <201104301630.p3UGUImC052983@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sat Apr 30 16:30:18 2011 New Revision: 221264 URL: http://svn.freebsd.org/changeset/base/221264 Log: 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 Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Sat Apr 30 14:52:49 2011 (r221263) +++ head/sys/netinet/tcp_input.c Sat Apr 30 16:30:18 2011 (r221264) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104301630.p3UGUImC052983>