CVS commit: src/sys/arch/usermode/dev

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Mon Jan  9 20:39:39 UTC 2012

Modified Files:
        src/sys/arch/usermode/dev: if_veth.c

Log Message:
Don't directly call softint_shedule() when we might be in an SPL level too
high.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/usermode/dev/if_veth.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/arch/usermode/dev/if_veth.c
diff -u src/sys/arch/usermode/dev/if_veth.c:1.2 src/sys/arch/usermode/dev/if_veth.c:1.3
--- src/sys/arch/usermode/dev/if_veth.c:1.2	Mon Dec 26 14:51:20 2011
+++ src/sys/arch/usermode/dev/if_veth.c	Mon Jan  9 20:39:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_veth.c,v 1.2 2011/12/26 14:51:20 jmcneill Exp $ */
+/* $NetBSD: if_veth.c,v 1.3 2012/01/09 20:39:39 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_veth.c,v 1.2 2011/12/26 14:51:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_veth.c,v 1.3 2012/01/09 20:39:39 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -174,7 +174,9 @@ veth_rx(void *priv)
 {
 	struct veth_softc *sc = priv;
 
-	softint_schedule(sc->sc_rx_intr);
+	curcpu()->ci_idepth++;
+	spl_intr(IPL_NET, softint_schedule, sc->sc_rx_intr);
+	curcpu()->ci_idepth--;
 
 	return 0;
 }