From owner-svn-src-stable-7@FreeBSD.ORG  Sun Nov 28 14:55:01 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 463BE106566B;
	Sun, 28 Nov 2010 14:55:01 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2ECF48FC0A;
	Sun, 28 Nov 2010 14:55:01 +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 oASEt1aI021967;
	Sun, 28 Nov 2010 14:55:01 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oASEt1Bb021965;
	Sun, 28 Nov 2010 14:55:01 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201011281455.oASEt1Bb021965@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 28 Nov 2010 14:55:01 +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: r215998 - stable/7/sys/dev/e1000
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Nov 2010 14:55:01 -0000

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 */