From owner-svn-src-all@FreeBSD.ORG  Sat Feb 26 11:52:35 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2123E106566C;
	Sat, 26 Feb 2011 11:52:35 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 102918FC12;
	Sat, 26 Feb 2011 11:52:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QBqYax070009;
	Sat, 26 Feb 2011 11:52:34 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QBqYme070007;
	Sat, 26 Feb 2011 11:52:34 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201102261152.p1QBqYme070007@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 26 Feb 2011 11:52:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219052 - stable/7/sys/compat/ndis
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 26 Feb 2011 11:52:35 -0000

Author: brucec
Date: Sat Feb 26 11:52:34 2011
New Revision: 219052
URL: http://svn.freebsd.org/changeset/base/219052

Log:
  MFC r218985:
  
  Use the cprd_mem field when setting the start and length for a memory
  resource - the layout of cprd_port is identical but using cprd_mem
  makes the code easier to understand.
  
  PR:           kern/118493
  Submitted by: Weongyo Jeong <weongyo.jeong at gmail.com>

Modified:
  stable/7/sys/compat/ndis/kern_ndis.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/compat/ndis/kern_ndis.c
==============================================================================
--- stable/7/sys/compat/ndis/kern_ndis.c	Sat Feb 26 11:46:06 2011	(r219051)
+++ stable/7/sys/compat/ndis/kern_ndis.c	Sat Feb 26 11:52:34 2011	(r219052)
@@ -642,9 +642,9 @@ ndis_convert_res(arg)
 				    CM_RESOURCE_MEMORY_READ_WRITE;
 				prd->cprd_sharedisp =
 				    CmResourceShareDeviceExclusive;
-				prd->u.cprd_port.cprd_start.np_quad =
+				prd->u.cprd_mem.cprd_start.np_quad =
 				    brle->start;
-				prd->u.cprd_port.cprd_len = brle->count;
+				prd->u.cprd_mem.cprd_len = brle->count;
 				break;
 			case SYS_RES_IRQ:
 				prd->cprd_type = CmResourceTypeInterrupt;