From owner-svn-src-all@FreeBSD.ORG Wed Sep 1 14:31:05 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EE0410656A4; Wed, 1 Sep 2010 14:31:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 541988FC19; Wed, 1 Sep 2010 14:31:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o81EV5qu068063; Wed, 1 Sep 2010 14:31:05 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o81EV5eB068060; Wed, 1 Sep 2010 14:31:05 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201009011431.o81EV5eB068060@svn.freebsd.org> From: John Baldwin Date: Wed, 1 Sep 2010 14:31:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212097 - stable/7/sys/dev/e1000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 01 Sep 2010 14:31:05 -0000 Author: jhb Date: Wed Sep 1 14:31:05 2010 New Revision: 212097 URL: http://svn.freebsd.org/changeset/base/212097 Log: Fix the build with DEVICE_POLLING enabled. Poll handlers return void instead of int on 7.x and earlier. Pointy hat to: jhb Modified: stable/7/sys/dev/e1000/if_em.c stable/7/sys/dev/e1000/if_lem.c Modified: stable/7/sys/dev/e1000/if_em.c ============================================================================== --- stable/7/sys/dev/e1000/if_em.c Wed Sep 1 13:47:11 2010 (r212096) +++ stable/7/sys/dev/e1000/if_em.c Wed Sep 1 14:31:05 2010 (r212097) @@ -1345,7 +1345,7 @@ em_init(void *arg) * Legacy polling routine: note this only works with single queue * *********************************************************************/ -static int +static void em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct adapter *adapter = ifp->if_softc; @@ -1357,7 +1357,7 @@ em_poll(struct ifnet *ifp, enum poll_cmd EM_CORE_LOCK(adapter); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { EM_CORE_UNLOCK(adapter); - return (0); + return; } if (cmd == POLL_AND_CHECK_STATUS) { @@ -1384,8 +1384,6 @@ em_poll(struct ifnet *ifp, enum poll_cmd em_start_locked(ifp, txr); #endif EM_TX_UNLOCK(txr); - - return (rx_done); } #endif /* DEVICE_POLLING */ Modified: stable/7/sys/dev/e1000/if_lem.c ============================================================================== --- stable/7/sys/dev/e1000/if_lem.c Wed Sep 1 13:47:11 2010 (r212096) +++ stable/7/sys/dev/e1000/if_lem.c Wed Sep 1 14:31:05 2010 (r212097) @@ -1231,7 +1231,7 @@ lem_init(void *arg) * Legacy polling routine * *********************************************************************/ -static int +static void lem_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct adapter *adapter = ifp->if_softc; @@ -1240,7 +1240,7 @@ lem_poll(struct ifnet *ifp, enum poll_cm EM_CORE_LOCK(adapter); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { EM_CORE_UNLOCK(adapter); - return (rx_done); + return; } if (cmd == POLL_AND_CHECK_STATUS) { @@ -1262,7 +1262,6 @@ lem_poll(struct ifnet *ifp, enum poll_cm if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) lem_start_locked(ifp); EM_TX_UNLOCK(adapter); - return (rx_done); } #endif /* DEVICE_POLLING */