svn commit: r235950 - head/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Fri May 25 01:13:39 2012
New Revision: 235950
URL: http://svn.freebsd.org/changeset/base/235950

Log:
  MFp4 bz_ipv6_fast:
  
    Factor out the tcp_hc_getmtu() call.  As the comments say it
    applies to both v4 and v6, so only write it once making it easier
    to read the protocol family specifc code.
  
    Sponsored by:	The FreeBSD Foundation
    Sponsored by:	iXsystems
  
  Reviewed by:	gnn (as part of the whole)
  MFC After:	3 days

Modified:
  head/sys/netinet/tcp_input.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Fri May 25 00:38:06 2012	(r235949)
+++ head/sys/netinet/tcp_input.c	Fri May 25 01:13:39 2012	(r235950)
@@ -3542,7 +3542,6 @@ tcp_mssopt(struct in_conninfo *inc)
 	if (inc->inc_flags & INC_ISIPV6) {
 		mss = V_tcp_v6mssdflt;
 		maxmtu = tcp_maxmtu6(inc, NULL);
-		thcmtu = tcp_hc_getmtu(inc); /* IPv4 and IPv6 */
 		min_protoh = sizeof(struct ip6_hdr) + sizeof(struct tcphdr);
 	}
 #endif
@@ -3553,10 +3552,13 @@ tcp_mssopt(struct in_conninfo *inc)
 	{
 		mss = V_tcp_mssdflt;
 		maxmtu = tcp_maxmtu(inc, NULL);
-		thcmtu = tcp_hc_getmtu(inc); /* IPv4 and IPv6 */
 		min_protoh = sizeof(struct tcpiphdr);
 	}
 #endif
+#if defined(INET6) || defined(INET)
+	thcmtu = tcp_hc_getmtu(inc); /* IPv4 and IPv6 */
+#endif
+
 	if (maxmtu && thcmtu)
 		mss = min(maxmtu, thcmtu) - min_protoh;
 	else if (maxmtu || thcmtu)