X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..378393581903b274cb7a4d18e0d978071a6b592d:/bsd/net/rtsock.c

diff --git a/bsd/net/rtsock.c b/bsd/net/rtsock.c
index d7ea4f733..82cef1b0a 100644
--- a/bsd/net/rtsock.c
+++ b/bsd/net/rtsock.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -163,7 +162,7 @@ rts_attach(struct socket *so, int proto, __unused struct proc *p)
 		so->so_flags |= SOF_PCBCLEARING;
 		return error;
 	}
-	socket_lock(so, 1);
+
 	switch(rp->rcb_proto.sp_protocol) {
 //####LD route_cb needs looking
 	case AF_INET:
@@ -181,9 +180,9 @@ rts_attach(struct socket *so, int proto, __unused struct proc *p)
 	}
 	rp->rcb_faddr = &route_src;
 	route_cb.any_count++;
+	/* the socket is already locked when we enter rts_attach */ 
 	soisconnected(so);
 	so->so_options |= SO_USELOOPBACK;
-	socket_unlock(so, 1);
 	return 0;
 }