diff --git a/src/ap/vlan_full.c b/src/ap/vlan_full.c index e362e987f..aa42335b9 100644 --- a/src/ap/vlan_full.c +++ b/src/ap/vlan_full.c @@ -13,19 +13,10 @@ /* Avoid conflicts due to NetBSD net/if.h if_type define with driver.h */ #undef if_type #include -/* From linux/if_bridge.h that can conflict with C library headers for IPv6 */ -#define BRCTL_GET_VERSION 0 -#define BRCTL_GET_BRIDGES 1 -#define BRCTL_ADD_BRIDGE 2 -#define BRCTL_DEL_BRIDGE 3 -#define BRCTL_ADD_IF 4 -#define BRCTL_DEL_IF 5 -#define BRCTL_GET_BRIDGE_INFO 6 -#define BRCTL_GET_PORT_LIST 7 -#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 #include "utils/common.h" #include "drivers/priv_netlink.h" +#include "common/linux_bridge.h" #include "common/linux_vlan.h" #include "utils/eloop.h" #include "hostapd.h" diff --git a/src/common/linux_bridge.h b/src/common/linux_bridge.h new file mode 100644 index 000000000..7b768464f --- /dev/null +++ b/src/common/linux_bridge.h @@ -0,0 +1,24 @@ +/* + * Linux bridge configuration kernel interface + * Copyright (c) 2016, Jouni Malinen + * + * This software may be distributed under the terms of the BSD license. + * See README for more details. + */ + +#ifndef LINUX_BRIDGE_H +#define LINUX_BRIDGE_H + +/* This interface is defined in linux/if_bridge.h */ + +#define BRCTL_GET_VERSION 0 +#define BRCTL_GET_BRIDGES 1 +#define BRCTL_ADD_BRIDGE 2 +#define BRCTL_DEL_BRIDGE 3 +#define BRCTL_ADD_IF 4 +#define BRCTL_DEL_IF 5 +#define BRCTL_GET_BRIDGE_INFO 6 +#define BRCTL_GET_PORT_LIST 7 +#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 + +#endif /* LINUX_BRIDGE_H */