diff options
| author | ps <ps@FreeBSD.org> | 2000-07-31 08:23:43 +0000 |
|---|---|---|
| committer | ps <ps@FreeBSD.org> | 2000-07-31 08:23:43 +0000 |
| commit | 7961d6fd993f9d1beca513996493e17d57df7c8c (patch) | |
| tree | ff087a42e577bd63e9bd480e074aa146069e3405 | |
| parent | 44f29410cecc651c578e18ce2acd889305e6a3b1 (diff) | |
| download | FreeBSD-src-7961d6fd993f9d1beca513996493e17d57df7c8c.zip FreeBSD-src-7961d6fd993f9d1beca513996493e17d57df7c8c.tar.gz | |
Remove unnecessary call to splnet when setting an accept filter
since we are already at splnet.
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 3 | ||||
| -rw-r--r-- | sys/kern/uipc_socket2.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index beb8fe5..3ff1a9c 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -107,18 +107,15 @@ soisconnected(so) struct socket *so; { struct socket *head = so->so_head; - int s; so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING); so->so_state |= SS_ISCONNECTED; if (head && (so->so_state & SS_INCOMP)) { if ((so->so_options & SO_ACCEPTFILTER) != 0) { - s = splnet(); so->so_upcall = head->so_accf->so_accept_filter->accf_callback; so->so_upcallarg = head->so_accf->so_accept_filter_arg; so->so_rcv.sb_flags |= SB_UPCALL; so->so_options &= ~SO_ACCEPTFILTER; - splx(s); so->so_upcall(so, so->so_upcallarg, 0); return; } diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index beb8fe5..3ff1a9c 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -107,18 +107,15 @@ soisconnected(so) struct socket *so; { struct socket *head = so->so_head; - int s; so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING); so->so_state |= SS_ISCONNECTED; if (head && (so->so_state & SS_INCOMP)) { if ((so->so_options & SO_ACCEPTFILTER) != 0) { - s = splnet(); so->so_upcall = head->so_accf->so_accept_filter->accf_callback; so->so_upcallarg = head->so_accf->so_accept_filter_arg; so->so_rcv.sb_flags |= SB_UPCALL; so->so_options &= ~SO_ACCEPTFILTER; - splx(s); so->so_upcall(so, so->so_upcallarg, 0); return; } |
