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 */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
