From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Tue, 25 Apr 2017 09:08:59 +0000 (+0900)
Subject: vendor: update vendored lif
X-Git-Tag: go1.9beta1~480
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9cb004be14da73e156258ef433551be3247b3682;p=gostls13.git

vendor: update vendored lif

Updates golang_org/x/net/lif to rev a25ba90 for:
- lif: don't fail test when at least one version of INET protocols is available

Updates #19967.

Change-Id: I4b946a4c6eee7938193688ecbfc4a9d69d88c94e
Reviewed-on: https://go-review.googlesource.com/41651
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/vendor/golang_org/x/net/lif/address_test.go b/src/vendor/golang_org/x/net/lif/address_test.go
index f62ed93471..a25f10b67a 100644
--- a/src/vendor/golang_org/x/net/lif/address_test.go
+++ b/src/vendor/golang_org/x/net/lif/address_test.go
@@ -78,15 +78,17 @@ type addrPack struct {
 }
 
 func addrPacks() ([]addrPack, error) {
+	var lastErr error
 	var aps []addrPack
 	for _, af := range [...]int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
 		as, err := Addrs(af, "")
 		if err != nil {
-			return nil, err
+			lastErr = err
+			continue
 		}
 		aps = append(aps, addrPack{af: af, as: as})
 	}
-	return aps, nil
+	return aps, lastErr
 }
 
 func TestAddrs(t *testing.T) {
diff --git a/src/vendor/golang_org/x/net/lif/link_test.go b/src/vendor/golang_org/x/net/lif/link_test.go
index 8fb2bf6f34..0cb9b95c69 100644
--- a/src/vendor/golang_org/x/net/lif/link_test.go
+++ b/src/vendor/golang_org/x/net/lif/link_test.go
@@ -21,15 +21,17 @@ type linkPack struct {
 }
 
 func linkPacks() ([]linkPack, error) {
+	var lastErr error
 	var lps []linkPack
 	for _, af := range [...]int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
 		lls, err := Links(af, "")
 		if err != nil {
-			return nil, err
+			lastErr = err
+			continue
 		}
 		lps = append(lps, linkPack{af: af, lls: lls})
 	}
-	return lps, nil
+	return lps, lastErr
 }
 
 func TestLinks(t *testing.T) {