DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

drivers: Support of dynamic VLAN requires Linux ioctls

Browse source 
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 <sergey.matyukevich.os@quantenna.com>
This commit is contained in:
Sergey Matyukevich 2019-10-08 00:08:32 +03:00 committed by Jouni Malinen
parent 07e69dfb05
commit a737e40b56
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/drivers/drivers.mak
View file

@ -140,10 +140,6 @@ ifdef NEED_NETLINK
DRV_OBJS += ../src/drivers/netlink.o DRV_OBJS += ../src/drivers/netlink.o
endif endif
ifdef NEED_LINUX_IOCTL
DRV_OBJS += ../src/drivers/linux_ioctl.o
endif
ifdef NEED_RFKILL ifdef NEED_RFKILL
DRV_OBJS += ../src/drivers/rfkill.o DRV_OBJS += ../src/drivers/rfkill.o
endif endif
@ -152,13 +148,18 @@ ifdef NEED_RADIOTAP
DRV_OBJS += ../src/utils/radiotap.o DRV_OBJS += ../src/utils/radiotap.o
endif endif
ifdef CONFIG_VLAN_NETLINK
ifdef CONFIG_FULL_DYNAMIC_VLAN ifdef CONFIG_FULL_DYNAMIC_VLAN
NEED_LINUX_IOCTL=y
ifdef CONFIG_VLAN_NETLINK
NEED_LIBNL=y NEED_LIBNL=y
CONFIG_LIBNL3_ROUTE=y CONFIG_LIBNL3_ROUTE=y
endif endif
endif endif
ifdef NEED_LINUX_IOCTL
DRV_OBJS += ../src/drivers/linux_ioctl.o
endif
ifdef NEED_LIBNL ifdef NEED_LIBNL
ifndef CONFIG_LIBNL32 ifndef CONFIG_LIBNL32
ifndef CONFIG_LIBNL20 ifndef CONFIG_LIBNL20

11
src/drivers/drivers.mk
View file

@ -132,10 +132,6 @@ ifdef NEED_NETLINK
DRV_OBJS += src/drivers/netlink.c DRV_OBJS += src/drivers/netlink.c
endif endif
ifdef NEED_LINUX_IOCTL
DRV_OBJS += src/drivers/linux_ioctl.c
endif
ifdef NEED_RFKILL ifdef NEED_RFKILL
DRV_OBJS += src/drivers/rfkill.c DRV_OBJS += src/drivers/rfkill.c
endif endif
@ -148,13 +144,18 @@ ifdef CONFIG_DRIVER_CUSTOM
DRV_CFLAGS += -DCONFIG_DRIVER_CUSTOM DRV_CFLAGS += -DCONFIG_DRIVER_CUSTOM
endif endif
ifdef CONFIG_VLAN_NETLINK
ifdef CONFIG_FULL_DYNAMIC_VLAN ifdef CONFIG_FULL_DYNAMIC_VLAN
NEED_LINUX_IOCTL=y
ifdef CONFIG_VLAN_NETLINK
NEED_LIBNL=y NEED_LIBNL=y
CONFIG_LIBNL3_ROUTE=y CONFIG_LIBNL3_ROUTE=y
endif endif
endif endif
ifdef NEED_LINUX_IOCTL
DRV_OBJS += src/drivers/linux_ioctl.c
endif
ifdef NEED_LIBNL ifdef NEED_LIBNL
ifdef CONFIG_LIBNL32 ifdef CONFIG_LIBNL32
DRV_LIBS += -lnl-3 DRV_LIBS += -lnl-3