From owner-svn-src-all@FreeBSD.ORG  Mon Mar 17 13:54:53 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ECB22A44;
 Mon, 17 Mar 2014 13:54:53 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9C8F7C0;
 Mon, 17 Mar 2014 13:54:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2HDsrd3075886;
 Mon, 17 Mar 2014 13:54:53 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2HDsr8h075885;
 Mon, 17 Mar 2014 13:54:53 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201403171354.s2HDsr8h075885@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 17 Mar 2014 13:54:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263265 - head/sys/boot/uboot/common
X-SVN-Group: head
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.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Mar 2014 13:54:54 -0000

Author: ian
Date: Mon Mar 17 13:54:53 2014
New Revision: 263265
URL: http://svnweb.freebsd.org/changeset/base/263265

Log:
  Fix the paren nesting so that the network device is probed if the load
  device type is either network or wildcard.

Modified:
  head/sys/boot/uboot/common/main.c

Modified: head/sys/boot/uboot/common/main.c
==============================================================================
--- head/sys/boot/uboot/common/main.c	Mon Mar 17 11:58:48 2014	(r263264)
+++ head/sys/boot/uboot/common/main.c	Mon Mar 17 13:54:53 2014	(r263265)
@@ -446,8 +446,8 @@ main(void)
 				break;
 		}
 
-		if (load_type == -1 || ((load_type & DEV_TYP_NET) &&
-		    strcmp(devsw[i]->dv_name, "net") == 0))
+		if ((load_type == -1 || (load_type & DEV_TYP_NET)) &&
+		    strcmp(devsw[i]->dv_name, "net") == 0)
 			break;
 	}