Date: Thu, 28 Aug 2014 18:59:40 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270758 - head/sys/dev/ixl Message-ID: <201408281859.s7SIxekg015911@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/kernel.h> #include <sys/module.h> #include <sys/sockio.h> +#include <sys/eventhandler.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_arp.h> #include <net/bpf.h> #include <net/ethernet.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408281859.s7SIxekg015911>