[dev.fuzz] all: merge master into dev.fuzz

Change-Id: I5d8c8329ccc9d747bd81ade6b1cb7cb8ae2e94b2

1 files changed, 5 insertions, 23 deletions

diff --git a/src/net/interface_solaris.go b/src/net/interface_solaris.go
index 5f9367f996..f8d1571b90 100644
--- a/src/net/interface_solaris.go
+++ b/src/net/interface_solaris.go
@@ -32,39 +32,21 @@ func interfaceTable(ifindex int) ([]Interface, error) {
 	return ift, nil
 }
 
-const (
-	sysIFF_UP          = 0x1
-	sysIFF_BROADCAST   = 0x2
-	sysIFF_DEBUG       = 0x4
-	sysIFF_LOOPBACK    = 0x8
-	sysIFF_POINTOPOINT = 0x10
-	sysIFF_NOTRAILERS  = 0x20
-	sysIFF_RUNNING     = 0x40
-	sysIFF_NOARP       = 0x80
-	sysIFF_PROMISC     = 0x100
-	sysIFF_ALLMULTI    = 0x200
-	sysIFF_INTELLIGENT = 0x400
-	sysIFF_MULTICAST   = 0x800
-	sysIFF_MULTI_BCAST = 0x1000
-	sysIFF_UNNUMBERED  = 0x2000
-	sysIFF_PRIVATE     = 0x8000
-)
-
 func linkFlags(rawFlags int) Flags {
 	var f Flags
-	if rawFlags&sysIFF_UP != 0 {
+	if rawFlags&syscall.IFF_UP != 0 {
 		f |= FlagUp
 	}
-	if rawFlags&sysIFF_BROADCAST != 0 {
+	if rawFlags&syscall.IFF_BROADCAST != 0 {
 		f |= FlagBroadcast
 	}
-	if rawFlags&sysIFF_LOOPBACK != 0 {
+	if rawFlags&syscall.IFF_LOOPBACK != 0 {
 		f |= FlagLoopback
 	}
-	if rawFlags&sysIFF_POINTOPOINT != 0 {
+	if rawFlags&syscall.IFF_POINTOPOINT != 0 {
 		f |= FlagPointToPoint
 	}
-	if rawFlags&sysIFF_MULTICAST != 0 {
+	if rawFlags&syscall.IFF_MULTICAST != 0 {
 		f |= FlagMulticast
 	}
 	return f