Author: nbd Date: 2015-03-27 15:55:01 +0100 (Fri, 27 Mar 2015) New Revision: 45063
Modified: trunk/package/network/services/hostapd/Makefile trunk/package/network/services/hostapd/files/hostapd-full.config trunk/package/network/services/hostapd/files/hostapd-mini.config trunk/package/network/services/hostapd/patches/600-ubus_support.patch Log: hostapd: fix compile errors with nl80211 disabled (#19325) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/network/services/hostapd/Makefile =================================================================== --- trunk/package/network/services/hostapd/Makefile 2015-03-27 14:54:53 UTC (rev 45062) +++ trunk/package/network/services/hostapd/Makefile 2015-03-27 14:55:01 UTC (rev 45063) @@ -64,6 +64,7 @@ endif DRIVER_MAKEOPTS= \ + CONFIG_ACS=$(CONFIG_PACKAGE_kmod-cfg80211) \ CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-cfg80211) \ CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \ CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \ Modified: trunk/package/network/services/hostapd/files/hostapd-full.config =================================================================== --- trunk/package/network/services/hostapd/files/hostapd-full.config 2015-03-27 14:54:53 UTC (rev 45062) +++ trunk/package/network/services/hostapd/files/hostapd-full.config 2015-03-27 14:55:01 UTC (rev 45063) @@ -163,6 +163,4 @@ CONFIG_WPS=y CONFIG_FULL_DYNAMIC_VLAN=y -CONFIG_ACS=y - CONFIG_UBUS=y Modified: trunk/package/network/services/hostapd/files/hostapd-mini.config =================================================================== --- trunk/package/network/services/hostapd/files/hostapd-mini.config 2015-03-27 14:54:53 UTC (rev 45062) +++ trunk/package/network/services/hostapd/files/hostapd-mini.config 2015-03-27 14:55:01 UTC (rev 45063) @@ -156,6 +156,4 @@ CONFIG_NO_RANDOM_POOL=y CONFIG_NO_DUMP_STATE=y -CONFIG_ACS=y - CONFIG_UBUS=y Modified: trunk/package/network/services/hostapd/patches/600-ubus_support.patch =================================================================== --- trunk/package/network/services/hostapd/patches/600-ubus_support.patch 2015-03-27 14:54:53 UTC (rev 45062) +++ trunk/package/network/services/hostapd/patches/600-ubus_support.patch 2015-03-27 14:55:01 UTC (rev 45063) @@ -41,7 +41,7 @@ HAPD_IFACE_DISABLED, --- /dev/null +++ b/src/ap/ubus.c -@@ -0,0 +1,490 @@ +@@ -0,0 +1,494 @@ +/* + * hostapd / ubus support + * Copyright (c) 2013, Felix Fietkau <[email protected]> @@ -358,6 +358,7 @@ + [CSA_BCN_COUNT] = { "bcn_count", BLOBMSG_TYPE_INT32 }, +}; + ++#ifdef NEED_AP_MLME +static int +hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, @@ -381,6 +382,7 @@ + return UBUS_STATUS_NOT_SUPPORTED; + return UBUS_STATUS_OK; +} ++#endif + +enum { + VENDOR_ELEMENTS, @@ -423,7 +425,9 @@ + UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans), + UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start), + UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel), ++#ifdef NEED_AP_MLME + UBUS_METHOD("switch_chan", hostapd_switch_chan, csa_policy), ++#endif + UBUS_METHOD("set_vendor_elements", hostapd_vendor_elements, ve_policy), +}; + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
