From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 21:45:39 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B17A6E1; Mon, 20 Apr 2015 21:45:39 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59F648DE; Mon, 20 Apr 2015 21:45:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3KLjdKF077149; Mon, 20 Apr 2015 21:45:39 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3KLjd7d077148; Mon, 20 Apr 2015 21:45:39 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201504202145.t3KLjd7d077148@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 20 Apr 2015 21:45:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281796 - projects/em_mq/sys/dev/e1000 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2015 21:45:39 -0000 Author: sbruno Date: Mon Apr 20 21:45:38 2015 New Revision: 281796 URL: https://svnweb.freebsd.org/changeset/base/281796 Log: Don't blindly assume that the softc returned is going to match up to the em(4) notion of what an adapter struct is. Check to see if the device matches *first* and *then* assume that we can use it as an adapter structure for parsing. Corrections and hints courtesy of jhb. Modified: projects/em_mq/sys/dev/e1000/if_em.c Modified: projects/em_mq/sys/dev/e1000/if_em.c ============================================================================== --- projects/em_mq/sys/dev/e1000/if_em.c Mon Apr 20 21:44:55 2015 (r281795) +++ projects/em_mq/sys/dev/e1000/if_em.c Mon Apr 20 21:45:38 2015 (r281796) @@ -5977,19 +5977,16 @@ em_enable_vectors_82574(struct adapter * DB_COMMAND(em_dump_queue, em_ddb_dump_queue) { devclass_t dc; - struct adapter *adapter; int max_em; dc = devclass_find("em"); max_em = devclass_get_maxunit(dc); - db_printf("max_em %d\n", max_em); for (int index = 0; index < (max_em - 1); index++) { - driver_t *em; - adapter = devclass_get_softc(dc, index); - em = device_get_driver(adapter->dev); - if (em == &em_driver) - em_print_debug_info(adapter); + device_t dev; + dev = devclass_get_device(dc, index); + if (device_get_driver(dev) == &em_driver) + em_print_debug_info(device_get_softc(dev)); } }