From owner-svn-src-all@freebsd.org  Mon May 11 21:23:22 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B9E7F2ED22A;
 Mon, 11 May 2020 21:23:22 +0000 (UTC)
 (envelope-from gallatin@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49LYnk4T1Lz4CjX;
 Mon, 11 May 2020 21:23:22 +0000 (UTC)
 (envelope-from gallatin@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94D6324E65;
 Mon, 11 May 2020 21:23:22 +0000 (UTC)
 (envelope-from gallatin@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04BLNMDn041052;
 Mon, 11 May 2020 21:23:22 GMT (envelope-from gallatin@FreeBSD.org)
Received: (from gallatin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04BLNMsD041051;
 Mon, 11 May 2020 21:23:22 GMT (envelope-from gallatin@FreeBSD.org)
Message-Id: <202005112123.04BLNMsD041051@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gallatin set sender to
 gallatin@FreeBSD.org using -f
From: Andrew Gallatin <gallatin@FreeBSD.org>
Date: Mon, 11 May 2020 21:23:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360930 - head/sys/netinet6
X-SVN-Group: head
X-SVN-Commit-Author: gallatin
X-SVN-Commit-Paths: head/sys/netinet6
X-SVN-Commit-Revision: 360930
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2020 21:23:22 -0000

Author: gallatin
Date: Mon May 11 21:23:22 2020
New Revision: 360930
URL: https://svnweb.freebsd.org/changeset/base/360930

Log:
  Fix the build
  
  Back out the IPv6 portion of r360903, as the stamp_tag param
  is apparently not supported in upstream FreeBSD.
  
  Sponsored by:	Netflix
  Pointy hat to: gallatin

Modified:
  head/sys/netinet6/ip6_output.c

Modified: head/sys/netinet6/ip6_output.c
==============================================================================
--- head/sys/netinet6/ip6_output.c	Mon May 11 21:22:16 2020	(r360929)
+++ head/sys/netinet6/ip6_output.c	Mon May 11 21:23:22 2020	(r360930)
@@ -353,10 +353,6 @@ ip6_output_send(struct inpcb *inp, struct ifnet *ifp, 
 			error = EAGAIN;
 			goto done;
 		}
-		/*
-		 * Always stamp tags that include NIC ktls.
-		 */
-		stamp_tag = true;
 	}
 #endif
 #ifdef RATELIMIT