From: Alexandros Couloumbis Date: Sat, 12 Sep 2020 06:40:13 +0000 (+0300) Subject: Merge branch 'master' into ozonet X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=90a50020b0ecbde13f58fa84e162c7fbd55e3760;p=openwrt%2F.git Merge branch 'master' into ozonet --- 90a50020b0ecbde13f58fa84e162c7fbd55e3760 diff --cc package/kernel/mac80211/ath.mk index c0d828f920,5db4be8daa..a95e6ce5ae --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@@ -3,22 -3,25 +3,16 @@@ PKG_DRIVERS += carl9170 owl-loader ar5523 PKG_CONFIG_DEPENDS += \ -- CONFIG_PACKAGE_ATH_DEBUG \ -- CONFIG_PACKAGE_ATH_DFS \ CONFIG_PACKAGE_ATH_SPECTRAL \ CONFIG_PACKAGE_ATH_DYNACK \ CONFIG_ATH9K_HWRNG \ CONFIG_ATH9K_SUPPORT_PCOEM \ -- CONFIG_ATH9K_TX99 \ -- CONFIG_ATH10K_LEDS \ -- CONFIG_ATH10K_THERMAL \ CONFIG_ATH_USER_REGD ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS config-y += \ ATH9K_DEBUGFS \ - ATH9K_HTC_DEBUGFS \ -- ATH10K_DEBUGFS \ - CARL9170_DEBUGFS \ - ATH5K_DEBUG \ - ATH6KL_DEBUG + ATH5K_DEBUG endif ifdef CONFIG_PACKAGE_MAC80211_TRACING diff --cc package/network/services/hostapd/files/hostapd.sh index 8aef19516e,b33e8e1edc..7a22ec39ce --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@@ -116,8 -119,9 +119,9 @@@ hostapd_prepare_device_config() set_default country_ie 1 set_default spectrum_mgmt_required 0 - set_default doth 1 + set_default doth 0 set_default legacy_rates 1 + set_default airtime_mode 0 [ "$hwmode" = "b" ] && legacy_rates=1