svn commit: r215998 - stable/7/sys/dev/e1000

Bjoern A. Zeeb bz at FreeBSD.org
Sun Nov 28 14:55:01 UTC 2010


Author: bz
Date: Sun Nov 28 14:55:00 2010
New Revision: 215998
URL: http://svn.freebsd.org/changeset/base/215998

Log:
  Make stable/7 LINT compile again unbreaking the if_lem polling interface
  implementation (returning void rather than int).

Modified:
  stable/7/sys/dev/e1000/if_lem.c

Modified: stable/7/sys/dev/e1000/if_lem.c
==============================================================================
--- stable/7/sys/dev/e1000/if_lem.c	Sun Nov 28 13:45:51 2010	(r215997)
+++ stable/7/sys/dev/e1000/if_lem.c	Sun Nov 28 14:55:00 2010	(r215998)
@@ -1229,7 +1229,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;
@@ -1238,7 +1238,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) {
@@ -1260,7 +1260,7 @@ 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);
+	return;
 }
 #endif /* DEVICE_POLLING */
 


More information about the svn-src-stable-7 mailing list