Author: pluknet
Date: Wed Jul 2 21:08:25 2014
New Revision: 268176
URL: http://svnweb.freebsd.org/changeset/base/268176
Log:
Fixed build with DEVICE_POLLING.
Modified:
head/sys/dev/bge/if_bge.c
head/sys/dev/nfe/if_nfe.c
Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c Wed Jul 2 20:40:59 2014 (r268175)
+++ head/sys/dev/bge/if_bge.c Wed Jul 2 21:08:25 2014 (r268176)
@@ -4796,7 +4796,7 @@ bge_tick(void *xsc)
*/
#ifdef DEVICE_POLLING
/* In polling mode we poll link state in bge_poll(). */
- if (!(sc->bge_if_getcapenable(ifp) & IFCAP_POLLING))
+ if (!(if_getcapenable(sc->bge_ifp) & IFCAP_POLLING))
#endif
{
sc->bge_link_evt++;
@@ -5830,7 +5830,7 @@ bge_ioctl(if_t ifp, u_long command, cadd
#ifdef DEVICE_POLLING
if (mask & IFCAP_POLLING) {
if (ifr->ifr_reqcap & IFCAP_POLLING) {
- error = ether_poll_register(bge_poll, ifp);
+ error = ether_poll_register_drv(bge_poll, ifp);
if (error)
return (error);
BGE_LOCK(sc);
Modified: head/sys/dev/nfe/if_nfe.c
==============================================================================
--- head/sys/dev/nfe/if_nfe.c Wed Jul 2 20:40:59 2014 (r268175)
+++ head/sys/dev/nfe/if_nfe.c Wed Jul 2 21:08:25 2014 (r268176)
@@ -1630,7 +1630,7 @@ nfe_free_tx_ring(struct nfe_softc *sc, s
}
#ifdef DEVICE_POLLING
-static poll_handler_t nfe_poll;
+static poll_handler_drv_t nfe_poll;
static int
@@ -1782,7 +1782,7 @@ nfe_ioctl(if_t ifp, u_long cmd, caddr_t
#ifdef DEVICE_POLLING
if ((mask & IFCAP_POLLING) != 0) {
if ((ifr->ifr_reqcap & IFCAP_POLLING) != 0) {
- error = ether_poll_register(nfe_poll, ifp);
+ error = ether_poll_register_drv(nfe_poll, ifp);
if (error)
break;
NFE_LOCK(sc);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
