diff options
| author | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
|---|---|---|
| committer | tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
| commit | e6fa9b9e922913444c2e6b2b58bf3de5eaed868d (patch) | |
| tree | 9d5f24794525313566896ab89aa860515db344a6 /sys/netinet/ip_input.c | |
| parent | 1ea6cbb8c29088e04528460633798a6c131ca1ba (diff) | |
| download | FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.zip FreeBSD-src-e6fa9b9e922913444c2e6b2b58bf3de5eaed868d.tar.gz | |
Back out my lats commit of locking down a socket, it conflicts with hsu's work.
Requested by: hsu
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index b33bc5b..b7c5ea3 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1836,18 +1836,15 @@ ip_savecontrol(inp, mp, ip, m) register struct ip *ip; register struct mbuf *m; { - SOCK_LOCK(inp->inp_socket); if (inp->inp_socket->so_options & SO_TIMESTAMP) { struct timeval tv; - SOCK_UNLOCK(inp->inp_socket); microtime(&tv); *mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv), SCM_TIMESTAMP, SOL_SOCKET); if (*mp) mp = &(*mp)->m_next; - } else - SOCK_UNLOCK(inp->inp_socket); + } if (inp->inp_flags & INP_RECVDSTADDR) { *mp = sbcreatecontrol((caddr_t) &ip->ip_dst, sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP); |
