From owner-svn-src-all@freebsd.org  Thu Aug 18 09:37:29 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 0DD0FBBD572;
 Thu, 18 Aug 2016 09:37:29 +0000 (UTC) (envelope-from mav@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 D49851D27;
 Thu, 18 Aug 2016 09:37:28 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7I9bSGv098995;
 Thu, 18 Aug 2016 09:37:28 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7I9bSPS098994;
 Thu, 18 Aug 2016 09:37:28 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201608180937.u7I9bSPS098994@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 18 Aug 2016 09:37:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r304371 - stable/11/sys/dev/ntb
X-SVN-Group: stable-11
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.22
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: Thu, 18 Aug 2016 09:37:29 -0000

Author: mav
Date: Thu Aug 18 09:37:27 2016
New Revision: 304371
URL: https://svnweb.freebsd.org/changeset/base/304371

Log:
  MFC r303551: Fix infinite loops introduced at r303429.

Modified:
  stable/11/sys/dev/ntb/ntb.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ntb/ntb.c
==============================================================================
--- stable/11/sys/dev/ntb/ntb.c	Thu Aug 18 09:36:45 2016	(r304370)
+++ stable/11/sys/dev/ntb/ntb.c	Thu Aug 18 09:37:27 2016	(r304371)
@@ -206,7 +206,7 @@ ntb_link_enable(device_t ntb, enum ntb_s
 	struct ntb_child **cpp = device_get_softc(device_get_parent(nc->dev));
 	struct ntb_child *nc1;
 
-	for (nc1 = *cpp; nc1 != NULL; nc1 = nc->next) {
+	for (nc1 = *cpp; nc1 != NULL; nc1 = nc1->next) {
 		if (nc1->enabled) {
 			nc->enabled = 1;
 			return (0);
@@ -226,7 +226,7 @@ ntb_link_disable(device_t ntb)
 	if (!nc->enabled)
 		return (0);
 	nc->enabled = 0;
-	for (nc1 = *cpp; nc1 != NULL; nc1 = nc->next) {
+	for (nc1 = *cpp; nc1 != NULL; nc1 = nc1->next) {
 		if (nc1->enabled)
 			return (0);
 	}