From owner-svn-src-all@FreeBSD.ORG  Mon Jun  8 19:56:23 2009
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 AAF6C10656B5;
	Mon,  8 Jun 2009 19:56:23 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99B6A8FC08;
	Mon,  8 Jun 2009 19:56:23 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58JuNVZ041114;
	Mon, 8 Jun 2009 19:56:23 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58JuNd2041113;
	Mon, 8 Jun 2009 19:56:23 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200906081956.n58JuNd2041113@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 8 Jun 2009 19:56:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193742 - head/sys/dev/if_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: Mon, 08 Jun 2009 19:56:24 -0000

Author: thompsa
Date: Mon Jun  8 19:56:23 2009
New Revision: 193742
URL: http://svn.freebsd.org/changeset/base/193742

Log:
  Commit missed driver_info to driver_ivar change in usb_attach_args.
  
  Pointed out by:	kib

Modified:
  head/sys/dev/if_ndis/if_ndis_usb.c

Modified: head/sys/dev/if_ndis/if_ndis_usb.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis_usb.c	Mon Jun  8 19:52:12 2009	(r193741)
+++ head/sys/dev/if_ndis/if_ndis_usb.c	Mon Jun  8 19:56:23 2009	(r193742)
@@ -149,7 +149,7 @@ ndisusb_match(device_t self)
 	db = windrv_match((matchfuncptr)ndisusb_devcompare, self);
 	if (db == NULL)
 		return (ENXIO);
-	uaa->driver_info = db;
+	uaa->driver_ivar = db;
 
 	return (0);
 }
@@ -165,7 +165,7 @@ ndisusb_attach(device_t self)
 	driver_object		*drv;
 	int			devidx = 0;
 
-	db = uaa->driver_info;
+	db = uaa->driver_ivar;
 	sc = (struct ndis_softc *)dummy;
 	sc->ndis_dev = self;
 	mtx_init(&sc->ndisusb_mtx, "NDIS USB", MTX_NETWORK_LOCK, MTX_DEF);