From owner-svn-src-all@FreeBSD.ORG Thu Aug 28 18:59:40 2014 Return-Path: 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 DD77EDAC; Thu, 28 Aug 2014 18:59:40 +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 AF2BF10C4; Thu, 28 Aug 2014 18:59:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SIxeDf015917; Thu, 28 Aug 2014 18:59:40 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SIxekg015911; Thu, 28 Aug 2014 18:59:40 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201408281859.s7SIxekg015911@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Thu, 28 Aug 2014 18:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270758 - head/sys/dev/ixl 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2014 18:59:41 -0000 Author: smh Date: Thu Aug 28 18:59:39 2014 New Revision: 270758 URL: http://svnweb.freebsd.org/changeset/base/270758 Log: Fix build breakage caused by ixl driver Fix missing includes and invalid vars in ixl / ixlv driver added by r270346 which caused build failures for GENERIC kernel after it was made default by r270755. X-MFC-With: r270346 / r270755 Sponsored by: Multiplay Modified: head/sys/dev/ixl/i40e_osdep.h head/sys/dev/ixl/if_ixlv.c head/sys/dev/ixl/ixl.h Modified: head/sys/dev/ixl/i40e_osdep.h ============================================================================== --- head/sys/dev/ixl/i40e_osdep.h Thu Aug 28 18:33:42 2014 (r270757) +++ head/sys/dev/ixl/i40e_osdep.h Thu Aug 28 18:59:39 2014 (r270758) @@ -191,7 +191,7 @@ rd32_osdep(struct i40e_osdep *osdep, uin KASSERT(reg < osdep->mem_bus_space_size, ("ixl: register offset %#jx too large (max is %#jx", - (uintmax_t)a, (uintmax_t)osdep->mem_bus_space_size)); + (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size)); return (bus_space_read_4(osdep->mem_bus_space_tag, osdep->mem_bus_space_handle, reg)); @@ -203,7 +203,7 @@ wr32_osdep(struct i40e_osdep *osdep, uin KASSERT(reg < osdep->mem_bus_space_size, ("ixl: register offset %#jx too large (max is %#jx", - (uintmax_t)a, (uintmax_t)osdep->mem_bus_space_size)); + (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size)); bus_space_write_4(osdep->mem_bus_space_tag, osdep->mem_bus_space_handle, reg, value); Modified: head/sys/dev/ixl/if_ixlv.c ============================================================================== --- head/sys/dev/ixl/if_ixlv.c Thu Aug 28 18:33:42 2014 (r270757) +++ head/sys/dev/ixl/if_ixlv.c Thu Aug 28 18:59:39 2014 (r270758) @@ -2311,7 +2311,7 @@ ixlv_update_link_status(struct ixlv_sc * static void ixlv_stop(struct ixlv_sc *sc) { - mtx_assert(&sc->sc_mtx, MA_OWNED); + mtx_assert(&sc->mtx, MA_OWNED); INIT_DBG_IF(&sc->vsi->ifp, "begin"); Modified: head/sys/dev/ixl/ixl.h ============================================================================== --- head/sys/dev/ixl/ixl.h Thu Aug 28 18:33:42 2014 (r270757) +++ head/sys/dev/ixl/ixl.h Thu Aug 28 18:59:39 2014 (r270758) @@ -47,8 +47,10 @@ #include #include #include +#include #include +#include #include #include #include