diff options
| -rw-r--r-- | sys/net/if_gre.c | 10 | ||||
| -rw-r--r-- | sys/net/if_pfsync.c | 6 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 6 | ||||
| -rw-r--r-- | sys/net/if_vxlan.c | 6 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 6 |
7 files changed, 23 insertions, 23 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 307ccb46783..95b3082f672 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.155 2019/11/10 11:44:10 dlg Exp $ */ +/* $OpenBSD: if_gre.c,v 1.156 2020/04/12 11:56:52 mpi Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -3904,12 +3904,12 @@ nvgre_send4(struct nvgre_softc *sc, struct mbuf_list *ml) imo.imo_ttl = sc->sc_tunnel.t_ttl; imo.imo_loop = 0; - NET_RLOCK(); + NET_LOCK(); while ((m = ml_dequeue(ml)) != NULL) { if (ip_output(m, NULL, NULL, IP_RAWOUTPUT, &imo, NULL, 0) != 0) oerrors++; } - NET_RUNLOCK(); + NET_UNLOCK(); return (oerrors); } @@ -3926,12 +3926,12 @@ nvgre_send6(struct nvgre_softc *sc, struct mbuf_list *ml) im6o.im6o_hlim = sc->sc_tunnel.t_ttl; im6o.im6o_loop = 0; - NET_RLOCK(); + NET_LOCK(); while ((m = ml_dequeue(ml)) != NULL) { if (ip6_output(m, NULL, NULL, 0, &im6o, NULL) != 0) oerrors++; } - NET_RUNLOCK(); + NET_UNLOCK(); return (oerrors); } diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 11824696f7d..ce9b909d4e7 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.269 2020/04/11 10:56:42 stsp Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.270 2020/04/12 11:56:52 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -1523,7 +1523,7 @@ pfsync_send_dispatch(void *xmq) if (ml_empty(&ml)) return; - NET_RLOCK(); + NET_LOCK(); sc = pfsyncif; if (sc == NULL) { ml_purge(&ml); @@ -1541,7 +1541,7 @@ pfsync_send_dispatch(void *xmq) } } done: - NET_RUNLOCK(); + NET_UNLOCK(); } void diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 3b4567bbb19..87fae9b9c92 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.220 2020/04/07 13:27:52 visa Exp $ */ +/* $OpenBSD: if_tun.c,v 1.221 2020/04/12 11:56:52 mpi Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -866,9 +866,9 @@ tun_dev_write(dev_t dev, struct uio *uio, int ioflag, int align) if (error != 0) goto drop; - NET_RLOCK(); + NET_LOCK(); if_vinput(ifp, m0); - NET_RUNLOCK(); + NET_UNLOCK(); tun_put(sc); return (0); diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index f82a1ba9ebe..2b95c235e48 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.76 2019/11/08 07:16:29 dlg Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.77 2020/04/12 11:56:52 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -329,11 +329,11 @@ vxlan_send_dispatch(void *xsc) if (ml_empty(&ml)) return; - NET_RLOCK(); + NET_LOCK(); while ((m = ml_dequeue(&ml)) != NULL) { vxlan_output(ifp, m); } - NET_RUNLOCK(); + NET_UNLOCK(); } diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index e1810afe156..da5edfeee9c 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.349 2020/02/18 12:13:40 mpi Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.350 2020/04/12 11:56:52 mpi Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -2921,12 +2921,12 @@ pf_sysctl(void *oldp, size_t *oldlenp, void *newp, size_t newlen) { struct pf_status pfs; - NET_RLOCK(); + NET_LOCK(); PF_LOCK(); memcpy(&pfs, &pf_status, sizeof(struct pf_status)); pfi_update_status(pfs.ifname, &pfs); PF_UNLOCK(); - NET_RUNLOCK(); + NET_UNLOCK(); return sysctl_rdstruct(oldp, oldlenp, newp, &pfs, sizeof(pfs)); } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 3866f8b06d1..ea27a4d0aaa 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.347 2019/12/23 22:33:57 sashan Exp $ */ +/* $OpenBSD: ip_input.c,v 1.348 2020/04/12 11:56:52 mpi Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -1784,11 +1784,11 @@ ip_send_dispatch(void *xmq) if (ml_empty(&ml)) return; - NET_RLOCK(); + NET_LOCK(); while ((m = ml_dequeue(&ml)) != NULL) { ip_output(m, NULL, NULL, 0, NULL, NULL, 0); } - NET_RUNLOCK(); + NET_UNLOCK(); } void diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 3dfa4f30599..e8d2e53fdd6 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.224 2019/12/30 14:52:00 bluhm Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.225 2020/04/12 11:56:53 mpi Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -1455,7 +1455,7 @@ ip6_send_dispatch(void *xmq) if (ml_empty(&ml)) return; - NET_RLOCK(); + NET_LOCK(); while ((m = ml_dequeue(&ml)) != NULL) { /* * To avoid a "too big" situation at an intermediate router and @@ -1466,7 +1466,7 @@ ip6_send_dispatch(void *xmq) */ ip6_output(m, NULL, NULL, IPV6_MINMTU, NULL, NULL); } - NET_RUNLOCK(); + NET_UNLOCK(); } void |