Gitiles
Code Review Sign In
git01.mediatek.com / openwrt / feeds / mtk-openwrt-feeds / 6ec8e3455de4ef61188b9316d96ef8448a2fe514 / . / autobuild_mac80211_release / 0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
blob: c281714082e3c3d0cb0a83cee9f7a4544d3735df [file] [log] [blame]
developerce9e5092022-11-10 22:41:59 +0800[diff] [blame]1diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
developer6ec8e342022-11-21 18:47:15 +0800[diff] [blame^]2index ec35bf6..d507de9 100644
developerce9e5092022-11-10 22:41:59 +0800[diff] [blame]3--- a/package/kernel/mac80211/Makefile
4+++ b/package/kernel/mac80211/Makefile
5@@ -19,6 +19,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
6 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)
7 PKG_BUILD_PARALLEL:=1
developer356ecec2022-11-14 10:25:04 +0800[diff] [blame]8
developerce9e5092022-11-10 22:41:59 +0800[diff] [blame]9+SOURCE_PATH:=./src
10 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
developer356ecec2022-11-14 10:25:04 +0800[diff] [blame]11
developerce9e5092022-11-10 22:41:59 +0800[diff] [blame]12 PKG_DRIVERS = \
developer6ec8e342022-11-21 18:47:15 +0800[diff] [blame^]13@@ -71,6 +72,10 @@ config-y:= \
14 WLAN_VENDOR_ST \
15 WLAN_VENDOR_TI \
16 WLAN_VENDOR_ZYDAS \
17+ MAC80211_DEBUG_MENU \
18+ MAC80211_MLME_DEBUG \
19+ MAC80211_STA_DEBUG \
20+ MAC80211_HT_DEBUG \
21
22 config-$(call config_package,cfg80211) += CFG80211
23 config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE
24@@ -296,6 +301,8 @@ define Build/Prepare
developer356ecec2022-11-14 10:25:04 +0800[diff] [blame]25 mkdir -p $(PKG_BUILD_DIR)
26 $(PKG_UNPACK)
27 $(Build/Patch)
28+ $(CP) $(SOURCE_PATH)/net $(PKG_BUILD_DIR) 2>/dev/null || :
29+ $(CP) $(SOURCE_PATH)/include $(PKG_BUILD_DIR) 2>/dev/null || :
30 rm -rf \
31 $(PKG_BUILD_DIR)/include/linux/ssb \
32 $(PKG_BUILD_DIR)/include/linux/bcma \
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]33diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
developer6ec8e342022-11-21 18:47:15 +0800[diff] [blame^]34index ed28052..a055005 100644
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]35--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
36+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
developer8d77be32022-10-20 15:08:25 +0800[diff] [blame]37@@ -144,9 +144,6 @@ mac80211_hostapd_setup_base() {
38 json_get_values ht_capab_list ht_capab
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]39 json_get_values channel_list channels
40
41- [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
42- channel_list="$channel"
43-
developer9b3248d2022-07-06 00:44:05 +0800[diff] [blame]44 [ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power"
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]45
developer9b3248d2022-07-06 00:44:05 +0800[diff] [blame]46 set_default noscan 0
developer9b3248d2022-07-06 00:44:05 +0800[diff] [blame]47diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
developer6ec8e342022-11-21 18:47:15 +0800[diff] [blame^]48index 3ecd932..438bf92 100644
developere2597ba2022-06-24 13:09:16 +0800[diff] [blame]49--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
50+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
developer8d77be32022-10-20 15:08:25 +0800[diff] [blame]51@@ -120,6 +120,13 @@ get_band_defaults() {
developere2597ba2022-06-24 13:09:16 +0800[diff] [blame]52 mode_band="$band"
53 channel="$chan"
54 htmode="$mode"
55+ if [ "$band" = "6g" ]
56+ then
57+ encryption=sae
58+ key=12345678
59+ else
60+ encryption=none
61+ fi
62 done
63 }
64
developer8d77be32022-10-20 15:08:25 +0800[diff] [blame]65@@ -162,6 +169,8 @@ detect_mac80211() {
developere2597ba2022-06-24 13:09:16 +0800[diff] [blame]66 channel=""
67 htmode=""
68 ht_capab=""
69+ encryption=""
70+ key=""
71
72 get_band_defaults "$dev"
73
developer8d77be32022-10-20 15:08:25 +0800[diff] [blame]74@@ -206,8 +215,12 @@ detect_mac80211() {
75 set wireless.default_${name}.network=lan
76 set wireless.default_${name}.mode=ap
77 set wireless.default_${name}.ssid=OpenWrt
78- set wireless.default_${name}.encryption=none
79+ set wireless.default_${name}.encryption=${encryption}
80+
developere2597ba2022-06-24 13:09:16 +0800[diff] [blame]81 EOF
82+ [ -n "$key" ] && {
developer8d77be32022-10-20 15:08:25 +0800[diff] [blame]83+ uci -q set wireless.default_${name}.key=${key}
developere2597ba2022-06-24 13:09:16 +0800[diff] [blame]84+ }
85 uci -q commit wireless
developer8d77be32022-10-20 15:08:25 +0800[diff] [blame]86 done
87 }
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]88--
developer6ec8e342022-11-21 18:47:15 +0800[diff] [blame^]892.36.1
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]90