From 9845c4d77823e8a570b125804947ef7878c51f15 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 8 Jul 2010 18:36:22 +0000 Subject: [PATCH] hostapd: make rfkill support optional --- src/drivers/drivers.mak | 4 +--- src/drivers/rfkill.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak index a03d4a034..8da44d9f5 100644 --- a/src/drivers/drivers.mak +++ b/src/drivers/drivers.mak @@ -54,7 +54,6 @@ NEED_SME=y NEED_AP_MLME=y NEED_NETLINK=y NEED_LINUX_IOCTL=y -NEED_RFKILL=y NEED_RADIOTAP=y NEED_LIBNL=y endif @@ -111,7 +110,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT CONFIG_WIRELESS_EXTENSION=y NEED_NETLINK=y NEED_LINUX_IOCTL=y -NEED_RFKILL=y endif ifdef CONFIG_DRIVER_NDIS @@ -137,7 +135,6 @@ endif ifdef CONFIG_WIRELESS_EXTENSION DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION DRV_WPA_OBJS += ../src/drivers/driver_wext.o -NEED_RFKILL=y endif ifdef NEED_NETLINK @@ -146,6 +143,7 @@ endif ifdef NEED_RFKILL DRV_OBJS += ../src/drivers/rfkill.o +DRV_WPA_CFLAGS += -DCONFIG_RFKILL endif ifdef NEED_RADIOTAP diff --git a/src/drivers/rfkill.h b/src/drivers/rfkill.h index 0412ac330..e27565375 100644 --- a/src/drivers/rfkill.h +++ b/src/drivers/rfkill.h @@ -18,8 +18,24 @@ struct rfkill_config { void (*unblocked_cb)(void *ctx); }; +#ifdef CONFIG_RFKILL struct rfkill_data * rfkill_init(struct rfkill_config *cfg); void rfkill_deinit(struct rfkill_data *rfkill); int rfkill_is_blocked(struct rfkill_data *rfkill); +#else +static inline struct rfkill_data * rfkill_init(struct rfkill_config *cfg) +{ + return (void *) 1; +} + +static inline void rfkill_deinit(struct rfkill_data *rfkill) +{ +} + +static inline int rfkill_is_blocked(struct rfkill_data *rfkill) +{ + return 0; +} +#endif #endif /* RFKILL_H */