mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-03-14 23:09:45 +01:00
89f57d48f9
Add patch:
- 001-PASN-Fix-the-compilation-errors-without-CONFIG_PASN.patch
Manually edit patches:
- 110-mbedtls-TLS-crypto-option-initial-port.patch
- 190-hostapd-Fix-hostapd-crash-if-setup-a-iface-with-.patch
- 191-hostapd-add-support-for-specifying-the-link-id-in-th.patch
- 220-indicate-features.patch
- 360-acs_retry.patch
-> Remove the extra check for -EBUSY (see below) because the code we
want to skip is now already guarded by:
https://git.w1.fi/cgit/hostap/commit/?id=af6473761f07ae4f13ef228dec618ca62faf6ef4
```
+ if (ret == -EBUSY)
+ goto fail;
```
- 341-mesh-ctrl-iface-channel-switch.patch
- 600-ubus_support.patch
- 601-ucode_support.patch
-> The patch had this and similar changes:
```
- if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
+ if (drv->first_bss->ifindex != ifi->ifi_index) {
```
Those changes should be unnecessary due to the commit:
https://git.w1.fi/cgit/hostap/commit/?id=2bf6d85963b9857b411b57cc7949e30ee2cb1216
- 780-Implement-APuP-Access-Point-Micro-Peering.patch
-> Needs adjustement because of Enhanced Privacy Protection (EPP):
https://git.w1.fi/cgit/hostap/commit/?id=1e13ee9c382a5d88c4bb0ffdfaf434fbb31123f3
Remove patch:
- 030-Revert-nl80211-Accept-a-global-nl80211-event-to-a-br.patch
- 060-nl80211-fix-reporting-spurious-frame-events.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=ca266cc24d8705eb1a2a0857ad326e48b1408b20
- 190-hostapd-Fix-hostapd-crash-if-setup-a-iface-with-.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=e275c3dc70e1c2947e02e43aeee6c4f9975c3dc7
- 192-nl80211-cancel-scans-whenever-the-first-bss-is-remov.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=5ce1d41803866782bbd96d575f53d43358a20a2e
- 350-nl80211_del_beacon_bss.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=b777ecb16274235974edb5c1dfcea6abab25f6c4
Tested-By: Daniel Pawlik <pawlik.dan@gmail.com>
Co-developed-by: Agustin Lorenzo <agustin.lorenzo@thinco.es>
Link: https://github.com/openwrt/openwrt/pull/20912
Signed-off-by: Nick Hainke <vincent@systemli.org>
65 lines
1.4 KiB
Diff
65 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
|
|
@@ -91,7 +90,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
|
|
@@ -117,7 +115,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
|
|
@@ -126,6 +123,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 */
|