From owner-svn-src-stable-11@freebsd.org  Thu Oct 12 14:08:57 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DF07E2A7A6;
 Thu, 12 Oct 2017 14:08:57 +0000 (UTC)
 (envelope-from n_hibma@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE84C7C7A9;
 Thu, 12 Oct 2017 14:08:56 +0000 (UTC)
 (envelope-from n_hibma@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9CE8t1B013922;
 Thu, 12 Oct 2017 14:08:55 GMT (envelope-from n_hibma@FreeBSD.org)
Received: (from n_hibma@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9CE8tac013921;
 Thu, 12 Oct 2017 14:08:55 GMT (envelope-from n_hibma@FreeBSD.org)
Message-Id: <201710121408.v9CE8tac013921@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: n_hibma set sender to
 n_hibma@FreeBSD.org using -f
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 12 Oct 2017 14:08:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r324548 - stable/11/sys/dev/smc
X-SVN-Group: stable-11
X-SVN-Commit-Author: n_hibma
X-SVN-Commit-Paths: stable/11/sys/dev/smc
X-SVN-Commit-Revision: 324548
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Oct 2017 14:08:57 -0000

Author: n_hibma
Date: Thu Oct 12 14:08:55 2017
New Revision: 324548
URL: https://svnweb.freebsd.org/changeset/base/324548

Log:
  MFC 324088:
  
  	Make smc compile with DEVICE_POLLING set.
  
  	smc_poll had the wrong prototype.
  
  Reviewed by:	benno

Modified:
  stable/11/sys/dev/smc/if_smc.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/smc/if_smc.c
==============================================================================
--- stable/11/sys/dev/smc/if_smc.c	Thu Oct 12 13:59:23 2017	(r324547)
+++ stable/11/sys/dev/smc/if_smc.c	Thu Oct 12 14:08:55 2017	(r324548)
@@ -782,7 +782,7 @@ smc_task_rx(void *context, int pending)
 }
 
 #ifdef DEVICE_POLLING
-static void
+static int
 smc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 {
 	struct smc_softc	*sc;
@@ -792,12 +792,13 @@ smc_poll(struct ifnet *ifp, enum poll_cmd cmd, int cou
 	SMC_LOCK(sc);
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
 		SMC_UNLOCK(sc);
-		return;
+		return (0);
 	}
 	SMC_UNLOCK(sc);
 
 	if (cmd == POLL_AND_CHECK_STATUS)
 		taskqueue_enqueue(sc->smc_tq, &sc->smc_intr);
+        return (0);
 }
 #endif