Author: jfv
Date: Sat Nov 27 18:18:09 2010
New Revision: 215943
URL: http://svn.freebsd.org/changeset/base/215943
Log:
Correct em_poll type for stable/7
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 Sat Nov 27 15:41:44 2010
(r215942)
+++ stable/7/sys/dev/e1000/if_em.c Sat Nov 27 18:18:09 2010
(r215943)
@@ -1270,7 +1270,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;
@@ -1282,7 +1282,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) {
@@ -1305,7 +1305,7 @@ em_poll(struct ifnet *ifp, enum poll_cmd
em_start_locked(ifp, txr);
EM_TX_UNLOCK(txr);
- return (rx_done);
+ return;
}
#endif /* DEVICE_POLLING */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
