aboutsummaryrefslogtreecommitdiffstats
path: root/src/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2016-05-12 07:26:10 (GMT)
committerJouni Malinen <j@w1.fi>2016-05-13 15:29:01 (GMT)
commitd58b60da87a741d35de74fa4eed34d7fc7085017 (patch)
treecdf4897b2ce34cbfdf678d36fb5a150ba12b822a /src/drivers
parent6a9681e90c08461c3bee4549985bb550ddf6c275 (diff)
downloadhostap-d58b60da87a741d35de74fa4eed34d7fc7085017.zip
hostap-d58b60da87a741d35de74fa4eed34d7fc7085017.tar.gz
hostap-d58b60da87a741d35de74fa4eed34d7fc7085017.tar.bz2
drivers: Add NEED_RADIOTAP
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>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/drivers.mak6
-rw-r--r--src/drivers/drivers.mk6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
index c1bfff1..c6d3f81 100644
--- a/src/drivers/drivers.mak
+++ b/src/drivers/drivers.mak
@@ -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_monitor.o
DRV_OBJS += ../src/drivers/driver_nl80211_scan.o
-DRV_OBJS += ../src/utils/radiotap.o
ifdef CONFIG_DRIVER_NL80211_QCA
DRV_CFLAGS += -DCONFIG_DRIVER_NL80211_QCA
endif
@@ -38,6 +37,7 @@ NEED_AP_MLME=y
NEED_NETLINK=y
NEED_LINUX_IOCTL=y
NEED_RFKILL=y
+NEED_RADIOTAP=y
ifdef CONFIG_LIBNL32
DRV_LIBS += -lnl-3
@@ -164,6 +164,10 @@ ifdef NEED_RFKILL
DRV_OBJS += ../src/drivers/rfkill.o
endif
+ifdef NEED_RADIOTAP
+DRV_OBJS += ../src/utils/radiotap.o
+endif
+
ifdef CONFIG_VLAN_NETLINK
ifdef CONFIG_FULL_DYNAMIC_VLAN
ifdef CONFIG_LIBNL32
diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk
index 0444e52..c6fe4c2 100644
--- a/src/drivers/drivers.mk
+++ b/src/drivers/drivers.mk
@@ -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_monitor.c
DRV_OBJS += src/drivers/driver_nl80211_scan.c
-DRV_OBJS += src/utils/radiotap.c
ifdef CONFIG_DRIVER_NL80211_QCA
DRV_CFLAGS += -DCONFIG_DRIVER_NL80211_QCA
endif
@@ -34,6 +33,7 @@ NEED_AP_MLME=y
NEED_NETLINK=y
NEED_LINUX_IOCTL=y
NEED_RFKILL=y
+NEED_RADIOTAP=y
ifdef CONFIG_LIBNL32
DRV_LIBS += -lnl-3
@@ -149,6 +149,10 @@ ifdef NEED_RFKILL
DRV_OBJS += src/drivers/rfkill.c
endif
+ifdef NEED_RADIOTAP
+DRV_OBJS += src/utils/radiotap.c
+endif
+
ifdef CONFIG_DRIVER_CUSTOM
DRV_CFLAGS += -DCONFIG_DRIVER_CUSTOM
endif