Author: nbd Date: 2015-09-14 08:51:10 +0200 (Mon, 14 Sep 2015) New Revision: 46903
Modified: trunk/package/kernel/mac80211/Makefile trunk/package/network/services/hostapd/Config.in trunk/package/network/services/hostapd/Makefile Log: mac80211/hostapd: rework 802.11w driver support selection, do not hardcode drivers in hostapd makefile Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/mac80211/Makefile =================================================================== --- trunk/package/kernel/mac80211/Makefile 2015-09-14 06:14:41 UTC (rev 46902) +++ trunk/package/kernel/mac80211/Makefile 2015-09-14 06:51:10 UTC (rev 46903) @@ -559,7 +559,7 @@ $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc) URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath9k - DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT +@KERNEL_RELAY + DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko @@ -607,7 +607,7 @@ $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11ac wireless cards support URL:=https://wireless.wiki.kernel.org/en/users/Drivers/ath10k - DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT + DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko Modified: trunk/package/network/services/hostapd/Config.in =================================================================== --- trunk/package/network/services/hostapd/Config.in 2015-09-14 06:14:41 UTC (rev 46902) +++ trunk/package/network/services/hostapd/Config.in 2015-09-14 06:51:10 UTC (rev 46903) @@ -46,3 +46,7 @@ config DRIVER_11N_SUPPORT bool default n + +config DRIVER_11W_SUPPORT + bool + default n Modified: trunk/package/network/services/hostapd/Makefile =================================================================== --- trunk/package/network/services/hostapd/Makefile 2015-09-14 06:14:41 UTC (rev 46902) +++ trunk/package/network/services/hostapd/Makefile 2015-09-14 06:51:10 UTC (rev 46903) @@ -71,7 +71,7 @@ CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \ ifeq ($(LOCAL_VARIANT),full) - DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) + DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT) endif ifneq ($(LOCAL_TYPE),hostapd) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
