|
@@ -294,24 +294,14 @@ func vxlanLinksIncompat(l1, l2 netlink.Link) string {
|
|
|
return ""
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func setAddr4(link *netlink.Vxlan, ipn *net.IPNet) error {
|
|
|
- addrs, err := netlink.AddrList(link, syscall.AF_INET)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
- for _, addr := range addrs {
|
|
|
- if err = netlink.AddrDel(link, &addr); err != nil {
|
|
|
- return fmt.Errorf("failed to delete IPv4 addr %s from %s", addr.String(), link.Attrs().Name)
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
|
|
ipn.Mask = net.CIDRMask(32, 32)
|
|
|
addr := netlink.Addr{IPNet: ipn, Label: ""}
|
|
|
- if err = netlink.AddrAdd(link, &addr); err != nil {
|
|
|
+ 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)
|
|
|
}
|
|
|
|