diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index a51ead20e978..1e4fd9ac4322 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -185,10 +185,28 @@ ncp_sock_send(struct socket *so, struct mbuf *top, struct ncp_rq *rqp)
 int
 ncp_poll(struct socket *so, int events)
 {
-    struct thread *td = curthread;
-    struct ucred *cred = NULL;
+	struct thread *td = curthread;
+	int revents;
 
-    return (sopoll(so, events, cred, td));
+	/* Fake up enough state to look like we are in poll(2). */
+	mtx_lock(&sellock);
+	mtx_lock_spin(&sched_lock);
+	td->td_flags |= TDF_SELECT;
+	mtx_unlock_spin(&sched_lock);
+	mtx_unlock(&sellock);
+	TAILQ_INIT(&td->td_selq);
+
+	revents = sopoll(so, events, NULL, td);
+
+	/* Tear down the fake poll(2) state. */
+	mtx_lock(&sellock);
+	clear_selinfo_list(td);
+	mtx_lock_spin(&sched_lock);
+	td->td_flags &= ~TDF_SELECT;
+	mtx_unlock_spin(&sched_lock);
+	mtx_unlock(&sellock);
+
+	return (revents);
 }
 
 int
@@ -196,7 +214,7 @@ ncp_sock_rselect(struct socket *so, struct thread *td, struct timeval *tv,
 		 int events)
 {
 	struct timeval atv, rtv, ttv;
-	int ncoll, timo, error = 0;
+	int ncoll, timo, error, revents;
 
 	if (tv) {
 		atv = *tv;
@@ -218,16 +236,18 @@ ncp_sock_rselect(struct socket *so, struct thread *td, struct timeval *tv,
 	mtx_unlock(&sellock);
 
 	TAILQ_INIT(&td->td_selq);
-	error = ncp_poll(so, events);
+	revents = sopoll(so, events, NULL, td);
 	mtx_lock(&sellock);
-	if (error) {
+	if (revents) {
 		error = 0;
 		goto done;
 	}
 	if (tv) {
 		getmicrouptime(&rtv);
-		if (timevalcmp(&rtv, &atv, >=))
+		if (timevalcmp(&rtv, &atv, >=)) {
+			error = EWOULDBLOCK;
 			goto done;
+		}
 		ttv = atv;
 		timevalsub(&ttv, &rtv);
 		timo = tvtohz(&ttv);
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 4c273cd90431..5db6b7e47573 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -94,18 +94,12 @@ nb_setsockopt_int(struct socket *so, int level, int name, int val)
 	return sosetopt(so, &sopt);
 }
 
-static __inline int
-nb_poll(struct nbpcb *nbp, int events, struct thread *td)
-{
-	return sopoll(nbp->nbp_tso, events, NULL, td);
-}
-
 static int
 nbssn_rselect(struct nbpcb *nbp, struct timeval *tv, int events,
 	struct thread *td)
 {
 	struct timeval atv, rtv, ttv;
-	int ncoll, timo, error;
+	int ncoll, timo, error, revents;
 
 	if (tv) {
 		atv = *tv;
@@ -128,16 +122,18 @@ nbssn_rselect(struct nbpcb *nbp, struct timeval *tv, int events,
 
 	/* XXX: Should be done when the thread is initialized. */
 	TAILQ_INIT(&td->td_selq);
-	error = nb_poll(nbp, events, td);
+	revents = sopoll(nbp->nbp_tso, events, NULL, td);
 	mtx_lock(&sellock);
-	if (error) {
+	if (revents) {
 		error = 0;
 		goto done;
 	}
 	if (tv) {
 		getmicrouptime(&rtv);
-		if (timevalcmp(&rtv, &atv, >=))
+		if (timevalcmp(&rtv, &atv, >=)) {
+			error = EWOULDBLOCK;
 			goto done;
+		}
 		ttv = atv;
 		timevalsub(&ttv, &rtv);
 		timo = tvtohz(&ttv);