Revert "ipv4, ipv6, internal/netreflect, bpf: fix the x/net build"

This reverts https://go-review.googlesource.com/c/37401 Updates golang/go#19051. Change-Id: Ia3cbc42213e3c519f91650e6308a7ca1f56b6189 Reviewed-on: https://go-review.googlesource.com/37417 Reviewed-by: Ian Lance Taylor <iant@golang.org>
golang · May 24, 2017 · aa0b216 · aa0b216
1 parent e1564c3
commit aa0b216
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 106 deletions.
diff --git a/bpf/vm_bpf_test.go b/bpf/vm_bpf_test.go
@@ -149,9 +149,6 @@ func testOSVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func()) {
 
 	p := ipv4.NewPacketConn(l)
 	if err = p.SetBPF(prog); err != nil {
-		if err.Error() == "operation not supported" { // TODO: gross. remove once 19051 fixed.
-			t.Skip("Skipping until Issue 19051 is fixed.")
-		}
 		t.Fatalf("failed to attach BPF program to listener: %v", err)
 	}
 

diff --git a/internal/netreflect/socket_19.go b/internal/netreflect/socket_19.go
diff --git a/ipv4/go19_test.go b/ipv4/go19_test.go
diff --git a/ipv4/ipv4_test.go b/ipv4/ipv4_test.go
diff --git a/ipv6/go19_test.go b/ipv6/go19_test.go
diff --git a/ipv6/ipv6_test.go b/ipv6/ipv6_test.go