Merge branch '1.4'

weaveworks · Jan 27, 2016 · 6680a8a · 6680a8a
2 parents 31f736b + 3679065
commit 6680a8a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/if.go b/net/if.go
@@ -53,7 +53,7 @@ func EnsureInterfaceAndMcastRoute(ifaceName string) (*net.Interface, error) {
 	}
 	dest := net.IPv4(224, 0, 0, 0)
 	check := func(route netlink.Route) bool {
-		return route.LinkIndex == iface.Index && route.Dst.IP.Equal(dest)
+		return route.LinkIndex == iface.Index && route.Dst != nil && route.Dst.IP.Equal(dest)
 	}
 	// check for currently-existing route after subscribing, to avoid race
 	routes, err := netlink.RouteList(nil, netlink.FAMILY_V4)