From owner-svn-src-stable@freebsd.org  Tue Jun  6 19:21:37 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 46305BF3386;
 Tue,  6 Jun 2017 19:21:37 +0000 (UTC) (envelope-from cy@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 1400B77BB4;
 Tue,  6 Jun 2017 19:21:37 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v56JLaQ7060273;
 Tue, 6 Jun 2017 19:21:36 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v56JLacK060272;
 Tue, 6 Jun 2017 19:21:36 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201706061921.v56JLacK060272@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 6 Jun 2017 19:21:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r319633 - stable/10/sys/contrib/ipfilter/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2017 19:21:37 -0000

Author: cy
Date: Tue Jun  6 19:21:35 2017
New Revision: 319633
URL: https://svnweb.freebsd.org/changeset/base/319633

Log:
  MFC r318998:
  
  Fix return value of ip_sync_nat. Previously, regardless of error it
  always returned a return code of 0.
  
  Obtained from:	NetBSD ip_sync.c r1.5

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_sync.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_sync.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_sync.c	Tue Jun  6 19:20:28 2017	(r319632)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_sync.c	Tue Jun  6 19:21:35 2017	(r319633)
@@ -939,7 +939,7 @@ ipf_sync_nat(softc, sp, data)
 	nat_t *n, *nat;
 	synclist_t *sl;
 	u_int hv = 0;
-	int err;
+	int err = 0;
 
 	READ_ENTER(&softs->ipf_syncnat);
 
@@ -1016,7 +1016,7 @@ ipf_sync_nat(softc, sp, data)
 	}
 
 	RWLOCK_EXIT(&softs->ipf_syncnat);
-	return 0;
+	return err;
 }