diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/uipc_socket.c | 9 | ||||
| -rw-r--r-- | sys/kern/uipc_socket2.c | 4 | ||||
| -rw-r--r-- | sys/net/if_ppp.c | 7 | ||||
| -rw-r--r-- | sys/net/pf.c | 6 | ||||
| -rw-r--r-- | sys/net/route.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in_pcb.c | 4 |
6 files changed, 9 insertions, 25 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 4ef4aed9fbc..9e8d05f6d90 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.162 2016/10/06 17:02:10 bluhm Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.163 2016/10/06 19:09:08 bluhm Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -189,10 +189,6 @@ solisten(struct socket *so, int backlog) return (0); } -/* - * Must be called at splsoftnet() - */ - void sofree(struct socket *so) { @@ -284,9 +280,6 @@ discard: return (error); } -/* - * Must be called at splsoftnet. - */ int soabort(struct socket *so) { diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index d0f8abb3d7d..c08e5955fa5 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.65 2016/09/02 13:28:21 bluhm Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.66 2016/10/06 19:09:08 bluhm Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -138,8 +138,6 @@ soisdisconnected(struct socket *so) * then we allocate a new structure, properly linked into the * data structure of the original socket, and return this. * Connstatus may be 0 or SS_ISCONNECTED. - * - * Must be called at splsoftnet() */ struct socket * sonewconn(struct socket *head, int connstatus) diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 32bce89c9ba..0abe679ae6f 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.100 2016/06/22 19:44:26 jca Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.101 2016/10/06 19:09:08 bluhm Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -300,7 +300,7 @@ pppalloc(pid_t pid) } /* - * Deallocate a ppp unit. Must be called at splsoftnet or higher. + * Deallocate a ppp unit. */ void pppdealloc(struct ppp_softc *sc) @@ -807,7 +807,6 @@ bad: /* * After a change in the NPmode for some NP, move packets from the * npqueue to the send queue or the fast queue as appropriate. - * Should be called at splsoftnet. */ static void ppp_requeue(struct ppp_softc *sc) @@ -1001,7 +1000,7 @@ ppp_dequeue(struct ppp_softc *sc) } /* - * Software interrupt routine, called at splsoftnet. + * Software interrupt routine. */ void pppintr(void) diff --git a/sys/net/pf.c b/sys/net/pf.c index f9f3cc31121..2c04dee36da 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.987 2016/09/27 04:57:17 dlg Exp $ */ +/* $OpenBSD: pf.c,v 1.988 2016/10/06 19:09:08 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1308,7 +1308,6 @@ pf_src_tree_remove_state(struct pf_state *s) } } -/* callers should be at splsoftnet */ void pf_remove_state(struct pf_state *cur) { @@ -1354,8 +1353,7 @@ pf_remove_divert_state(struct pf_state_key *sk) } } -/* callers should be at splsoftnet and hold the - * write_lock on pf_consistency_lock */ +/* callers should hold the write_lock on pf_consistency_lock */ void pf_free_state(struct pf_state *cur) { diff --git a/sys/net/route.c b/sys/net/route.c index 93baeffd4f6..a04b0958d5f 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.332 2016/10/05 08:07:46 mpi Exp $ */ +/* $OpenBSD: route.c,v 1.333 2016/10/06 19:09:08 bluhm Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -533,8 +533,6 @@ ifafree(struct ifaddr *ifa) * destination to go through the given gateway. * Normally called as a result of a routing redirect * message from the network layer. - * - * N.B.: must be called at splsoftnet */ void rtredirect(struct sockaddr *dst, struct sockaddr *gateway, diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 18b5c2e84eb..b4b10be6dbb 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.215 2016/09/15 02:00:18 dlg Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.216 2016/10/06 19:09:08 bluhm Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -655,8 +655,6 @@ in_setpeeraddr(struct inpcb *inp, struct mbuf *nam) * cmds that are uninteresting (e.g., no error in the map). * Call the protocol specific routine (if any) to report * any errors for each matching socket. - * - * Must be called at splsoftnet. */ void in_pcbnotifyall(struct inpcbtable *table, struct sockaddr *dst, u_int rdomain, |