From owner-svn-src-head@FreeBSD.ORG  Wed Jul  2 21:08:26 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8E35A576;
 Wed,  2 Jul 2014 21:08:26 +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 7BC6521F5;
 Wed,  2 Jul 2014 21:08:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62L8Qhg091248;
 Wed, 2 Jul 2014 21:08:26 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62L8QmG091246;
 Wed, 2 Jul 2014 21:08:26 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201407022108.s62L8QmG091246@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 2 Jul 2014 21:08:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268176 - in head/sys/dev: bge nfe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jul 2014 21:08:26 -0000

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);