reconcile merge

Signed-off-by: Huamin Chen <hchen@redhat.com>

vendor/golang.org/x/net/internal/nettest/helper_bsd.go

@@ -8,28 +8,8 @@ package nettest
 
 import (
 	"runtime"
-	"strconv"
-	"strings"
-	"syscall"
 )
 
-var darwinVersion int
-
-func init() {
-	if runtime.GOOS == "darwin" {
-		// See http://support.apple.com/kb/HT1633.
-		s, err := syscall.Sysctl("kern.osrelease")
-		if err != nil {
-			return
-		}
-		ss := strings.Split(s, ".")
-		if len(ss) == 0 {
-			return
-		}
-		darwinVersion, _ = strconv.Atoi(ss[0])
-	}
-}
-
 func supportsIPv6MulticastDeliveryOnLoopback() bool {
 	switch runtime.GOOS {
 	case "freebsd":
@@ -38,16 +18,7 @@ func supportsIPv6MulticastDeliveryOnLoopback() bool {
 		// kernels don't deliver link-local scoped multicast
 		// packets correctly.
 		return false
-	case "darwin":
-		return !causesIPv6Crash()
 	default:
 		return true
 	}
 }
-
-func causesIPv6Crash() bool {
-	// We see some kernel crash when running IPv6 with IP-level
-	// options on Darwin kernel version 12 or below.
-	// See golang.org/issues/17015.
-	return darwinVersion < 13
-}

vendor/golang.org/x/net/internal/nettest/helper_nobsd.go

@@ -9,7 +9,3 @@ package nettest
 func supportsIPv6MulticastDeliveryOnLoopback() bool {
 	return true
 }
-
-func causesIPv6Crash() bool {
-	return false
-}

vendor/golang.org/x/net/internal/nettest/helper_stub.go

@@ -23,10 +23,6 @@ func supportsIPv6MulticastDeliveryOnLoopback() bool {
 	return false
 }
 
-func causesIPv6Crash() bool {
-	return false
-}
-
 func protocolNotSupported(err error) bool {
 	return false
 }

vendor/golang.org/x/net/internal/nettest/helper_windows.go

@@ -36,7 +36,3 @@ func supportsRawIPSocket() (string, bool) {
 func supportsIPv6MulticastDeliveryOnLoopback() bool {
 	return true
 }
-
-func causesIPv6Crash() bool {
-	return false
-}

vendor/golang.org/x/net/internal/socket/sys_bsdvar.go

@@ -6,9 +6,15 @@
 
 package socket
 
-import "unsafe"
+import (
+	"runtime"
+	"unsafe"
+)
 
 func probeProtocolStack() int {
+	if runtime.GOOS == "openbsd" && runtime.GOARCH == "arm" {
+		return 8
+	}
 	var p uintptr
 	return int(unsafe.Sizeof(p))
 }