developer | ce9e509 | 2022-11-10 22:41:59 +0800 | [diff] [blame] | 1 | diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile |
| 2 | index 44428ca..f34286b 100644 |
| 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 |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 8 | |
developer | ce9e509 | 2022-11-10 22:41:59 +0800 | [diff] [blame] | 9 | +SOURCE_PATH:=./src |
| 10 | PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 11 | |
developer | ce9e509 | 2022-11-10 22:41:59 +0800 | [diff] [blame] | 12 | PKG_DRIVERS = \ |
| 13 | @@ -450,6 +451,8 @@ define Build/Prepare |
| 14 | mkdir -p $(PKG_BUILD_DIR) |
| 15 | $(PKG_UNPACK) |
| 16 | $(Build/Patch) |
| 17 | + $(CP) ${SOURCE_PATH)/net ${PKG_BUILD_DIR) 2>/dev/null || : |
| 18 | + $(CP) ${SOURCE_PATH)/include ${PKG_BUILD_DIR) 2>/dev/null || : |
| 19 | $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz |
| 20 | $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz |
| 21 | $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 22 | diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 23 | index ed280521..a0550057 100644 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 24 | --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh |
| 25 | +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 26 | @@ -144,9 +144,6 @@ mac80211_hostapd_setup_base() { |
| 27 | json_get_values ht_capab_list ht_capab |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 28 | json_get_values channel_list channels |
| 29 | |
| 30 | - [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \ |
| 31 | - channel_list="$channel" |
| 32 | - |
developer | 9b3248d | 2022-07-06 00:44:05 +0800 | [diff] [blame] | 33 | [ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power" |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 34 | |
developer | 9b3248d | 2022-07-06 00:44:05 +0800 | [diff] [blame] | 35 | set_default noscan 0 |
developer | 9b3248d | 2022-07-06 00:44:05 +0800 | [diff] [blame] | 36 | diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 37 | index 3ecd9322..438bf929 100644 |
developer | e2597ba | 2022-06-24 13:09:16 +0800 | [diff] [blame] | 38 | --- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh |
| 39 | +++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 40 | @@ -120,6 +120,13 @@ get_band_defaults() { |
developer | e2597ba | 2022-06-24 13:09:16 +0800 | [diff] [blame] | 41 | mode_band="$band" |
| 42 | channel="$chan" |
| 43 | htmode="$mode" |
| 44 | + if [ "$band" = "6g" ] |
| 45 | + then |
| 46 | + encryption=sae |
| 47 | + key=12345678 |
| 48 | + else |
| 49 | + encryption=none |
| 50 | + fi |
| 51 | done |
| 52 | } |
| 53 | |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 54 | @@ -162,6 +169,8 @@ detect_mac80211() { |
developer | e2597ba | 2022-06-24 13:09:16 +0800 | [diff] [blame] | 55 | channel="" |
| 56 | htmode="" |
| 57 | ht_capab="" |
| 58 | + encryption="" |
| 59 | + key="" |
| 60 | |
| 61 | get_band_defaults "$dev" |
| 62 | |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 63 | @@ -206,8 +215,12 @@ detect_mac80211() { |
| 64 | set wireless.default_${name}.network=lan |
| 65 | set wireless.default_${name}.mode=ap |
| 66 | set wireless.default_${name}.ssid=OpenWrt |
| 67 | - set wireless.default_${name}.encryption=none |
| 68 | + set wireless.default_${name}.encryption=${encryption} |
| 69 | + |
developer | e2597ba | 2022-06-24 13:09:16 +0800 | [diff] [blame] | 70 | EOF |
| 71 | + [ -n "$key" ] && { |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 72 | + uci -q set wireless.default_${name}.key=${key} |
developer | e2597ba | 2022-06-24 13:09:16 +0800 | [diff] [blame] | 73 | + } |
| 74 | uci -q commit wireless |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 75 | done |
| 76 | } |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 77 | -- |
developer | 8d77be3 | 2022-10-20 15:08:25 +0800 | [diff] [blame] | 78 | 2.18.0 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 79 | |