jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

drivers: Add NEED_RADIOTAP

Browse source 
If there's ever a driver that, like nl80211, requires radiotap,
we need to have a NEED_RADIOTAP variable to avoid trying to link
the radiotap helpers twice. Introduce that.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
This commit is contained in:
Johannes Berg 2016-05-12 09:26:10 +02:00 committed by Jouni Malinen
parent 6a9681e90c
commit d58b60da87
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/drivers/drivers.mak
View file

@ -29,7 +29,6 @@ DRV_OBJS += ../src/drivers/driver_nl80211_capa.o
DRV_OBJS += ../src/drivers/driver_nl80211_event.o DRV_OBJS += ../src/drivers/driver_nl80211_event.o
DRV_OBJS += ../src/drivers/driver_nl80211_monitor.o DRV_OBJS += ../src/drivers/driver_nl80211_monitor.o
DRV_OBJS += ../src/drivers/driver_nl80211_scan.o DRV_OBJS += ../src/drivers/driver_nl80211_scan.o
DRV_OBJS += ../src/utils/radiotap.o
ifdef CONFIG_DRIVER_NL80211_QCA ifdef CONFIG_DRIVER_NL80211_QCA
DRV_CFLAGS += -DCONFIG_DRIVER_NL80211_QCA DRV_CFLAGS += -DCONFIG_DRIVER_NL80211_QCA
endif endif
@ -38,6 +37,7 @@ NEED_AP_MLME=y
NEED_NETLINK=y NEED_NETLINK=y
NEED_LINUX_IOCTL=y NEED_LINUX_IOCTL=y
NEED_RFKILL=y NEED_RFKILL=y
NEED_RADIOTAP=y
ifdef CONFIG_LIBNL32 ifdef CONFIG_LIBNL32
DRV_LIBS += -lnl-3 DRV_LIBS += -lnl-3
@ -164,6 +164,10 @@ ifdef NEED_RFKILL
DRV_OBJS += ../src/drivers/rfkill.o DRV_OBJS += ../src/drivers/rfkill.o
endif endif
ifdef NEED_RADIOTAP
DRV_OBJS += ../src/utils/radiotap.o
endif
ifdef CONFIG_VLAN_NETLINK ifdef CONFIG_VLAN_NETLINK
ifdef CONFIG_FULL_DYNAMIC_VLAN ifdef CONFIG_FULL_DYNAMIC_VLAN
ifdef CONFIG_LIBNL32 ifdef CONFIG_LIBNL32

6
src/drivers/drivers.mk
View file

@ -25,7 +25,6 @@ DRV_OBJS += src/drivers/driver_nl80211_capa.c
DRV_OBJS += src/drivers/driver_nl80211_event.c DRV_OBJS += src/drivers/driver_nl80211_event.c
DRV_OBJS += src/drivers/driver_nl80211_monitor.c DRV_OBJS += src/drivers/driver_nl80211_monitor.c
DRV_OBJS += src/drivers/driver_nl80211_scan.c DRV_OBJS += src/drivers/driver_nl80211_scan.c
DRV_OBJS += src/utils/radiotap.c
ifdef CONFIG_DRIVER_NL80211_QCA ifdef CONFIG_DRIVER_NL80211_QCA
DRV_CFLAGS += -DCONFIG_DRIVER_NL80211_QCA DRV_CFLAGS += -DCONFIG_DRIVER_NL80211_QCA
endif endif
@ -34,6 +33,7 @@ NEED_AP_MLME=y
NEED_NETLINK=y NEED_NETLINK=y
NEED_LINUX_IOCTL=y NEED_LINUX_IOCTL=y
NEED_RFKILL=y NEED_RFKILL=y
NEED_RADIOTAP=y
ifdef CONFIG_LIBNL32 ifdef CONFIG_LIBNL32
DRV_LIBS += -lnl-3 DRV_LIBS += -lnl-3
@ -149,6 +149,10 @@ ifdef NEED_RFKILL
DRV_OBJS += src/drivers/rfkill.c DRV_OBJS += src/drivers/rfkill.c
endif endif
ifdef NEED_RADIOTAP
DRV_OBJS += src/utils/radiotap.c
endif
ifdef CONFIG_DRIVER_CUSTOM ifdef CONFIG_DRIVER_CUSTOM
DRV_CFLAGS += -DCONFIG_DRIVER_CUSTOM DRV_CFLAGS += -DCONFIG_DRIVER_CUSTOM
endif endif