Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Oct 2017 14:08:55 +0000 (UTC)
From:      Nick Hibma <n_hibma@FreeBSD.org>
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
Message-ID:  <201710121408.v9CE8tac013921@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710121408.v9CE8tac013921>