f628d0e0e9
Update to latest upstream HEAD: - Refreshed all - Delete patches and parts which made it upstream Compile tested Full & Mini configs Run-tested Mini config Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> [another update, remove broken patch]
61 lines
1.3 KiB
Diff
61 lines
1.3 KiB
Diff
--- a/src/drivers/drivers.mak
|
|
+++ b/src/drivers/drivers.mak
|
|
@@ -49,7 +49,6 @@ NEED_SME=y
|
|
NEED_AP_MLME=y
|
|
NEED_NETLINK=y
|
|
NEED_LINUX_IOCTL=y
|
|
-NEED_RFKILL=y
|
|
NEED_RADIOTAP=y
|
|
|
|
ifdef CONFIG_LIBNL32
|
|
@@ -136,7 +135,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
|
|
@@ -162,7 +160,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
|
|
@@ -175,6 +172,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 */
|