From 682569741ad2cff260affde940be9101bc004e57 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 3 Jan 2020 21:47:45 +0100 Subject: executor: fix IPVLAN_F_VEPA definition again Now other machines failed with redefinition IPVLAN_F_VEPA. The #ifndef does not really work the way it should due to the way pkg/csource preprocesses sources. IPVLAN_F_VEPA is never defined during preprocessing. Let's try this. --- executor/common_linux.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'executor/common_linux.h') diff --git a/executor/common_linux.h b/executor/common_linux.h index bfc4788c7..618425bed 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -319,9 +319,8 @@ static void netlink_add_macvlan(struct nlmsg* nlmsg, int sock, const char* name, #define IFLA_IPVLAN_FLAGS 2 #define IPVLAN_MODE_L3S 2 -#ifndef IPVLAN_F_VEPA +#undef IPVLAN_F_VEPA #define IPVLAN_F_VEPA 2 -#endif static void netlink_add_ipvlan(struct nlmsg* nlmsg, int sock, const char* name, const char* link, uint16 mode, uint16 flags) { -- cgit mrf-deployment