From owner-svn-src-head@FreeBSD.ORG  Mon Oct 13 21:05:29 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D25EBC15;
 Mon, 13 Oct 2014 21:05:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BBFA2EEC;
 Mon, 13 Oct 2014 21:05:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DL5Thn069196;
 Mon, 13 Oct 2014 21:05:29 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DL5TNa069195;
 Mon, 13 Oct 2014 21:05:29 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201410132105.s9DL5TNa069195@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 13 Oct 2014 21:05:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273062 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Oct 2014 21:05:29 -0000

Author: sbruno
Date: Mon Oct 13 21:05:29 2014
New Revision: 273062
URL: https://svnweb.freebsd.org/changeset/base/273062

Log:
  Catch ipv6 case when attempting to do PLPMTUD blackhole detection.
  
  Submitted by:	Mikhail <mp@lenta.ru>
  MFC after:	2 weeks
  Relnotes:	yes

Modified:
  head/sys/netinet/tcp_output.c

Modified: head/sys/netinet/tcp_output.c
==============================================================================
--- head/sys/netinet/tcp_output.c	Mon Oct 13 21:04:14 2014	(r273061)
+++ head/sys/netinet/tcp_output.c	Mon Oct 13 21:05:29 2014	(r273062)
@@ -1273,6 +1273,11 @@ send:
 		 */
 		ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6));
 
+		if (V_path_mtu_discovery && tp->t_maxopd > V_tcp_minmss)
+			tp->t_flags2 |= TF2_PLPMTU_PMTUD;
+		else
+			tp->t_flags2 &= ~TF2_PLPMTU_PMTUD;
+
 		if (tp->t_state == TCPS_SYN_SENT)
 			TCP_PROBE5(connect__request, NULL, tp, ip6, tp, th);