summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-13 17:00:18 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-13 17:00:18 +0000
commit124f6910b162b56b980b5571e61374fe0dfc1166 (patch)
treebfaa8bd3839eb2ff400ef83346b1b68653a0947c
parent589d5bb0681d7ee21232f59861e74cfb161db13e (diff)
hostapd: fix madwifi related linker error (include wext support for non-wpad hostapd builds)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23987 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hostapd/patches/310-madwifi_merge.patch13
-rw-r--r--package/hostapd/patches/540-optional_rfkill.patch4
2 files changed, 15 insertions, 2 deletions
diff --git a/package/hostapd/patches/310-madwifi_merge.patch b/package/hostapd/patches/310-madwifi_merge.patch
index 4fb92c532..b62fb3f20 100644
--- a/package/hostapd/patches/310-madwifi_merge.patch
+++ b/package/hostapd/patches/310-madwifi_merge.patch
@@ -771,3 +771,16 @@
-#endif /* HOSTAPD */
+#endif
};
+--- a/src/drivers/drivers.mak
++++ b/src/drivers/drivers.mak
+@@ -168,8 +168,8 @@ DRV_WPA_OBJS += ../src/drivers/driver_ro
+ endif
+
+ ifdef CONFIG_WIRELESS_EXTENSION
+-DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
+-DRV_WPA_OBJS += ../src/drivers/driver_wext.o
++DRV_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
++DRV_OBJS += ../src/drivers/driver_wext.o
+ NEED_RFKILL=y
+ endif
+
diff --git a/package/hostapd/patches/540-optional_rfkill.patch b/package/hostapd/patches/540-optional_rfkill.patch
index c70bcf4a5..3ec7e239a 100644
--- a/package/hostapd/patches/540-optional_rfkill.patch
+++ b/package/hostapd/patches/540-optional_rfkill.patch
@@ -243,8 +243,8 @@
ifdef CONFIG_DRIVER_HERMES
@@ -170,7 +168,6 @@ endif
ifdef CONFIG_WIRELESS_EXTENSION
- DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
- DRV_WPA_OBJS += ../src/drivers/driver_wext.o
+ DRV_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
+ DRV_OBJS += ../src/drivers/driver_wext.o
-NEED_RFKILL=y
endif