diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-12-21 12:28:50 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-12-21 12:28:50 +0000 |
| commit | 513994da422916556616ee665d7694db88070d74 (patch) | |
| tree | dcb0a2cb2bc94d9d501e77c70736f368d1190443 | |
| parent | 597eda32415dcb74037697b43f252929ded75926 (diff) | |
Remove the netlock workaround since if_detach is doing it for us now.
ok mpi, bluhm
| -rw-r--r-- | sys/net/if_pflow.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index 0df0b69fd8a..d625e8c45b1 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.63 2016/12/20 15:07:32 mpi Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.64 2016/12/21 12:28:49 mikeb Exp $ */ /* * Copyright (c) 2011 Florian Obser <florian@narrans.de> @@ -267,10 +267,7 @@ pflow_clone_destroy(struct ifnet *ifp) pflow_flush(sc); m_freem(sc->send_nam); if (sc->so != NULL) { - /* XXXSMP breaks atomicity */ - rw_exit_write(&netlock); error = soclose(sc->so); - rw_enter_write(&netlock); sc->so = NULL; } if (sc->sc_flowdst != NULL) |