diff options
| author | Seigo Tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
|---|---|---|
| committer | Seigo Tanimura <tanimura@FreeBSD.org> | 2002-05-31 11:52:35 +0000 |
| commit | 4cc20ab1f0f3d1126126327aa298ab88c974c53d (patch) | |
| tree | 9d5f24794525313566896ab89aa860515db344a6 /sys/netinet/ip_input.c | |
| parent | c82593cf2c9a5b4ccd2be043f6c9ccc8af22fcc9 (diff) | |
| download | src-4cc20ab1f0f3d1126126327aa298ab88c974c53d.tar.gz src-4cc20ab1f0f3d1126126327aa298ab88c974c53d.zip | |
Back out my lats commit of locking down a socket, it conflicts with hsu's work.
Requested by: hsu
Notes
Notes:
svn path=/head/; revision=97658
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 b33bc5bdf36f..b7c5ea3872c3 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); |