From owner-svn-src-all@FreeBSD.ORG  Sat Nov 27 18:18:09 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8192D106564A;
	Sat, 27 Nov 2010 18:18:09 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FF168FC19;
	Sat, 27 Nov 2010 18:18:09 +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 oARII904081789;
	Sat, 27 Nov 2010 18:18:09 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oARII9NX081787;
	Sat, 27 Nov 2010 18:18:09 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201011271818.oARII9NX081787@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Sat, 27 Nov 2010 18:18:09 +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: r215943 - stable/7/sys/dev/e1000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Nov 2010 18:18:09 -0000

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