diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-10-06 19:09:08 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-10-06 19:09:08 +0000 |
| commit | 1bf96e4c5a3205d8c238b1b17c9f5f96e325fb31 (patch) | |
| tree | d0f7707b21b996afcb9a2f332fdb1c91bdf86e06 /sys/net | |
| parent | Print the root check error message to stderr. While there add the name (diff) | |
| download | wireguard-openbsd-1bf96e4c5a3205d8c238b1b17c9f5f96e325fb31.tar.xz wireguard-openbsd-1bf96e4c5a3205d8c238b1b17c9f5f96e325fb31.zip | |
Remove redundant comments that say a function must be called at
splsoftnet() if the function does a splsoftassert(IPL_SOFTNET)
anyway.
Diffstat (limited to 'sys/net')
| -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 |
3 files changed, 6 insertions, 11 deletions
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, |