summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-02-07 15:34:48 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-02-07 15:34:48 +0000
commit1253329041c0d34d481492f4eb1374370ec26d7b (patch)
tree892ae1ef0157a02f6388a8a817902d21b630bcf3
parentd0da4fceb7047eaa78f77f788d2418c2d3a3c9e5 (diff)
No longer need to unlock the netlock since the upper layer is doing it.
Found by Hrvoje Popovski.
-rw-r--r--sys/net/if_pflow.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index e6aec01e913..f3ac47a8d94 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflow.c,v 1.72 2017/01/25 06:15:50 mpi Exp $ */
+/* $OpenBSD: if_pflow.c,v 1.73 2017/02/07 15:34:47 mpi Exp $ */
/*
* Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -508,8 +508,6 @@ pflowioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
sizeof(pflowr))))
return (error);
- /* XXXSMP breaks atomicity */
- rw_exit_write(&netlock);
s = splnet();
error = pflow_set(sc, &pflowr);
splx(s);
@@ -527,7 +525,6 @@ pflowioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
} else
ifp->if_flags &= ~IFF_RUNNING;
- rw_enter_write(&netlock);
break;
default: