Imported Upstream version 2011.01.12upstream/2011.01.12

1 files changed, 3 insertions, 3 deletions

diff --git a/src/pkg/net/ipsock.go b/src/pkg/net/ipsock.go
index 9477420d6..4ba6a55b9 100644
--- a/src/pkg/net/ipsock.go
+++ b/src/pkg/net/ipsock.go
@@ -24,7 +24,7 @@ func kernelSupportsIPv6() bool {
 	}
 	fd, e := syscall.Socket(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
 	if fd >= 0 {
-		syscall.Close(fd)
+		closesocket(fd)
 	}
 	return e == 0
 }
@@ -68,12 +68,12 @@ func internetSocket(net string, laddr, raddr sockaddr, socktype, proto int, mode
 
 	var la, ra syscall.Sockaddr
 	if laddr != nil {
-		if la, oserr = laddr.sockaddr(family); err != nil {
+		if la, oserr = laddr.sockaddr(family); oserr != nil {
 			goto Error
 		}
 	}
 	if raddr != nil {
-		if ra, oserr = raddr.sockaddr(family); err != nil {
+		if ra, oserr = raddr.sockaddr(family); oserr != nil {
 			goto Error
 		}
 	}