upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-24 23:57:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build breakage caused by ixl driver

Browse source 
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
This commit is contained in:
Steven Hartland 2014-08-28 18:59:39 +00:00
parent caf5f7a84c
commit 13b408044d
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/ixl/i40e_osdep.h
View file

@ -191,7 +191,7 @@ rd32_osdep(struct i40e_osdep *osdep, uint32_t reg)
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, uint32_t reg, uint32_t value)
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);

2
sys/dev/ixl/if_ixlv.c
View file

@ -2311,7 +2311,7 @@ ixlv_update_link_status(struct ixlv_sc *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");

2
sys/dev/ixl/ixl.h
View file

@ -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>