From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Thu, 25 Jul 2013 10:29:20 +0000 (+0900)
Subject: net: simplify probeIPv6Stack
X-Git-Tag: go1.2rc2~945
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c0a4ce52c604829f9b2b320a54bf0c41057c78ca;p=gostls13.git

net: simplify probeIPv6Stack

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/11807043
---

diff --git a/src/pkg/net/ipsock_posix.go b/src/pkg/net/ipsock_posix.go
index 4c37616ecf..37827cbb2d 100644
--- a/src/pkg/net/ipsock_posix.go
+++ b/src/pkg/net/ipsock_posix.go
@@ -28,8 +28,8 @@ import (
 // boolean value is true, kernel supports IPv6 IPv4-mapping.
 func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
 	var probes = []struct {
-		la TCPAddr
-		ok bool
+		laddr TCPAddr
+		ok    bool
 	}{
 		// IPv6 communication capability
 		{TCPAddr{IP: ParseIP("::1")}, false},
@@ -44,12 +44,11 @@ func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
 		}
 		defer closesocket(s)
 		syscall.SetsockoptInt(s, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 0)
-		sa, err := probes[i].la.toAddr().sockaddr(syscall.AF_INET6)
+		sa, err := probes[i].laddr.sockaddr(syscall.AF_INET6)
 		if err != nil {
 			continue
 		}
-		err = syscall.Bind(s, sa)
-		if err != nil {
+		if err := syscall.Bind(s, sa); err != nil {
 			continue
 		}
 		probes[i].ok = true