mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
92379080ea
This adds From:, Date: and Subject: to patches, allowing one to run 'git am' to import the patches to a hostapd git repository. From: and Date: fields were taken from the OpenWrt commit where the patches were first introduced. Most of the Subject: also followed suit, except for: - 300-noscan.patch: Took the description from the LuCI web interface - 350-nl80211_del_beacon_bss.patch: Used the file name The order of the files in the patch was changed to match what git format-patch does. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
66 lines
1.4 KiB
Diff
66 lines
1.4 KiB
Diff
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Thu, 8 Jul 2010 18:36:22 +0000
|
|
Subject: [PATCH] hostapd: make rfkill support optional
|
|
|
|
--- 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
|
|
--- 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 */
|