Author: jfv
Date: Sun May 16 04:31:16 2010
New Revision: 208127
URL: http://svn.freebsd.org/changeset/base/208127
Log:
Change poll routine to conform to proper interface.
Modified:
stable/7/sys/dev/e1000/if_em.c
Modified: stable/7/sys/dev/e1000/if_em.c
==============================================================================
--- stable/7/sys/dev/e1000/if_em.c Sun May 16 00:43:49 2010
(r208126)
+++ stable/7/sys/dev/e1000/if_em.c Sun May 16 04:31:16 2010
(r208127)
@@ -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;
@@ -1356,7 +1356,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 (rx_done);
+ return;
}
if (cmd == POLL_AND_CHECK_STATUS) {
@@ -1386,7 +1386,7 @@ em_poll(struct ifnet *ifp, enum poll_cmd
#endif
EM_TX_UNLOCK(txr);
- return (rx_done);
+ return;
}
#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"
