From 55f04f41c02491b806c6ae312e0ba16455f8ad25 Mon Sep 17 00:00:00 2001 From: dlg Date: Thu, 11 Aug 2016 00:58:22 +0000 Subject: [PATCH] take TASKQ_CANTSLEEP way from the softnet taskq. the big reason for this is to let us use rw locks in the network stack, which is how at least two major efforts outside the tree have approached making pf mpsafe. this was discussed at length at n2k16. there was general agreement that this is necessary for us to move smp work forward in the stack. --- sys/net/if.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 198251439c5..8c3208460bd 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.436 2016/07/13 16:45:19 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.437 2016/08/11 00:58:22 dlg Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -241,8 +241,7 @@ ifinit(void) timeout_set(&net_tick_to, net_tick, &net_tick_to); - softnettq = taskq_create("softnet", 1, IPL_NET, - TASKQ_MPSAFE | TASKQ_CANTSLEEP); + softnettq = taskq_create("softnet", 1, IPL_NET, TASKQ_MPSAFE); if (softnettq == NULL) panic("unable to create softnet taskq"); -- 2.20.1