From owner-svn-src-projects@freebsd.org  Mon Jan  9 11:34:34 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48C29CA67F9
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  9 Jan 2017 11:34:34 +0000 (UTC) (envelope-from ae@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 mx1.freebsd.org (Postfix) with ESMTPS id 15DE51232;
 Mon,  9 Jan 2017 11:34:34 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09BYX3E044850;
 Mon, 9 Jan 2017 11:34:33 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09BYXDC044849;
 Mon, 9 Jan 2017 11:34:33 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201701091134.v09BYXDC044849@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 9 Jan 2017 11:34:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r311783 - projects/ipsec/sys/netipsec
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2017 11:34:34 -0000

Author: ae
Date: Mon Jan  9 11:34:33 2017
New Revision: 311783
URL: https://svnweb.freebsd.org/changeset/base/311783

Log:
  Save SP generation id when cache is updated.

Modified:
  projects/ipsec/sys/netipsec/ipsec.c

Modified: projects/ipsec/sys/netipsec/ipsec.c
==============================================================================
--- projects/ipsec/sys/netipsec/ipsec.c	Mon Jan  9 11:31:04 2017	(r311782)
+++ projects/ipsec/sys/netipsec/ipsec.c	Mon Jan  9 11:34:33 2017	(r311783)
@@ -375,8 +375,10 @@ ipsec_cachepolicy(struct inpcb *inp, str
 	 */
 	key_addref(sp);
 	genid = key_getspgen();
-	if (genid != inp->inp_sp->genid)
+	if (genid != inp->inp_sp->genid) {
 		ipsec_invalidate_cache(inp, dir);
+		inp->inp_sp->genid = genid;
+	}
 	KEYDBG(IPSEC_STAMP,
 	    printf("%s: PCB(%p): cached SP(%p)\n",
 	    __func__, inp, sp));