Update to latest netlink

flannel-io · Jun 15, 2016 · 18bb551 · 18bb551
1 parent 5a2db92
commit 18bb551
Show file tree

Hide file tree

Showing 58 changed files with 5,729 additions and 737 deletions.
diff --git a/backend/udp/network.go b/backend/udp/network.go
@@ -155,7 +155,7 @@ func configureIface(ifname string, ipn ip.IP4Net, mtu int) error {
 		return fmt.Errorf("failed to lookup interface %v", ifname)
 	}
 
-	err = netlink.AddrAdd(iface, &netlink.Addr{ipn.ToIPNet(), ""})
+	err = netlink.AddrAdd(iface, &netlink.Addr{IPNet: ipn.ToIPNet(), Label: ""})
 	if err != nil {
 		return fmt.Errorf("failed to add IP address %v to %v: %v", ipn.String(), ifname, err)
 	}

diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
@@ -302,7 +302,7 @@ func setAddr4(link *netlink.Vxlan, ipn *net.IPNet) error {
 		}
 	}
 
-	addr := netlink.Addr{ipn, ""}
+	addr := netlink.Addr{IPNet: ipn, Label: ""}
 	if err = netlink.AddrAdd(link, &addr); err != nil {
 		return fmt.Errorf("failed to add IP address %s to %s: %s", ipn.String(), link.Attrs().Name, err)
 	}

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -48,7 +48,7 @@ import:
 - package: github.com/vaughan0/go-ini
   version: a98ad7ee00ec53921f08832bc06ecf7fd600e6a1
 - package: github.com/vishvananda/netlink
-  version: a57a12c1b1d8aa37cf2f9da4fa7657b1f1fed88c
+  version: 293adec04146bfb07bf34f75921ebc9c1ee2cd74
   subpackages:
   - nl
 - package: golang.org/x/net

diff --git a/vendor/github.com/vishvananda/netlink/.travis.yml b/vendor/github.com/vishvananda/netlink/.travis.yml
diff --git a/vendor/github.com/vishvananda/netlink/Makefile b/vendor/github.com/vishvananda/netlink/Makefile
diff --git a/vendor/github.com/vishvananda/netlink/README.md b/vendor/github.com/vishvananda/netlink/README.md
diff --git a/vendor/github.com/vishvananda/netlink/addr.go b/vendor/github.com/vishvananda/netlink/addr.go
diff --git a/vendor/github.com/vishvananda/netlink/addr_linux.go b/vendor/github.com/vishvananda/netlink/addr_linux.go