CVS commit: src/sys/rump/net/lib/libshmif

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Thu Dec 22 10:13:09 UTC 2016

Modified Files:
        src/sys/rump/net/lib/libshmif: if_shmem.c

Log Message:
Fix handling return value of rumpcomp_shmif_watchwait


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/rump/net/lib/libshmif/if_shmem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.70 src/sys/rump/net/lib/libshmif/if_shmem.c:1.71
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.70	Thu Dec 15 09:28:07 2016
+++ src/sys/rump/net/lib/libshmif/if_shmem.c	Thu Dec 22 10:13:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_shmem.c,v 1.70 2016/12/15 09:28:07 ozaki-r Exp $	*/
+/*	$NetBSD: if_shmem.c,v 1.71 2016/12/22 10:13:09 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.70 2016/12/15 09:28:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.71 2016/12/22 10:13:09 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -685,8 +685,7 @@ shmif_rcv(void *arg)
 		    shmif_nextpktoff(busmem, busmem->shm_last)
 		     == sc->sc_nextpacket) {
 			shmif_unlockbus(busmem);
-			error = 0;
-			rumpcomp_shmif_watchwait(sc->sc_kq);
+			error = rumpcomp_shmif_watchwait(sc->sc_kq);
 			if (__predict_false(error))
 				printf("shmif_rcv: wait failed %d\n", error);
 			membar_consumer();