diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-08-11 21:24:21 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-08-11 21:24:21 +0000 |
| commit | bda0e09dc4819e6f0da56bc659a507a53ce2c49e (patch) | |
| tree | b8a35df42b1a236d2f93a31c84fab1deb17e8a67 /sys/netinet/ip_carp.c | |
| parent | 119ca99b6e7df0e54659d9e9b1b7f7960196ac58 (diff) | |
Remove NET_LOCK()'s argument.
Tested by Hrvoje Popovski, ok bluhm@
Diffstat (limited to 'sys/netinet/ip_carp.c')
| -rw-r--r-- | sys/netinet/ip_carp.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 5e3a0c26faf..a18d778f2e9 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.314 2017/06/22 11:34:51 tom Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.315 2017/08/11 21:24:19 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -870,11 +870,10 @@ int carp_clone_destroy(struct ifnet *ifp) { struct carp_softc *sc = ifp->if_softc; - int s; - NET_LOCK(s); + NET_LOCK(); carpdetach(sc); - NET_UNLOCK(s); + NET_UNLOCK(); ether_ifdetach(ifp); if_detach(ifp); @@ -1036,11 +1035,9 @@ carp_vhe_send_ad_all(struct carp_softc *sc) void carp_timer_ad(void *v) { - int s; - - NET_LOCK(s); + NET_LOCK(); carp_send_ad(v); - NET_UNLOCK(s); + NET_UNLOCK(); } void @@ -1548,11 +1545,9 @@ done: void carp_timer_down(void *v) { - int s; - - NET_LOCK(s); + NET_LOCK(); carp_master_down(v); - NET_UNLOCK(s); + NET_UNLOCK(); } void |