From a737e40b5653b622ba8d49e4c0e9c54176963a90 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 8 Oct 2019 00:08:32 +0300 Subject: [PATCH] drivers: Support of dynamic VLAN requires Linux ioctls Support for dynamic VLANs depends on the Linux bridge ioctls. Add this dependency explicitely to drivers make files. This fixes build for minimal hostapd configs such as: CONFIG_DRIVER_WIRED=y CONFIG_FULL_DYNAMIC_VLAN=y Signed-off-by: Sergey Matyukevich --- src/drivers/drivers.mak | 11 ++++++----- src/drivers/drivers.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak index 442c59cf4..bc2e87e08 100644 --- a/src/drivers/drivers.mak +++ b/src/drivers/drivers.mak @@ -140,10 +140,6 @@ ifdef NEED_NETLINK DRV_OBJS += ../src/drivers/netlink.o endif -ifdef NEED_LINUX_IOCTL -DRV_OBJS += ../src/drivers/linux_ioctl.o -endif - ifdef NEED_RFKILL DRV_OBJS += ../src/drivers/rfkill.o endif @@ -152,13 +148,18 @@ ifdef NEED_RADIOTAP DRV_OBJS += ../src/utils/radiotap.o endif -ifdef CONFIG_VLAN_NETLINK ifdef CONFIG_FULL_DYNAMIC_VLAN +NEED_LINUX_IOCTL=y +ifdef CONFIG_VLAN_NETLINK NEED_LIBNL=y CONFIG_LIBNL3_ROUTE=y endif endif +ifdef NEED_LINUX_IOCTL +DRV_OBJS += ../src/drivers/linux_ioctl.o +endif + ifdef NEED_LIBNL ifndef CONFIG_LIBNL32 ifndef CONFIG_LIBNL20 diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk index 599a0b579..c3c2c0fe1 100644 --- a/src/drivers/drivers.mk +++ b/src/drivers/drivers.mk @@ -132,10 +132,6 @@ ifdef NEED_NETLINK DRV_OBJS += src/drivers/netlink.c endif -ifdef NEED_LINUX_IOCTL -DRV_OBJS += src/drivers/linux_ioctl.c -endif - ifdef NEED_RFKILL DRV_OBJS += src/drivers/rfkill.c endif @@ -148,13 +144,18 @@ ifdef CONFIG_DRIVER_CUSTOM DRV_CFLAGS += -DCONFIG_DRIVER_CUSTOM endif -ifdef CONFIG_VLAN_NETLINK ifdef CONFIG_FULL_DYNAMIC_VLAN +NEED_LINUX_IOCTL=y +ifdef CONFIG_VLAN_NETLINK NEED_LIBNL=y CONFIG_LIBNL3_ROUTE=y endif endif +ifdef NEED_LINUX_IOCTL +DRV_OBJS += src/drivers/linux_ioctl.c +endif + ifdef NEED_LIBNL ifdef CONFIG_LIBNL32 DRV_LIBS += -lnl-3