Compare commits

..

1 Commits

Author SHA1 Message Date
Paul White
a54fe26076 feeds.default.conf: switch to using git:// instead of https://
Signed-off-by: Paul White <paul@shasta.cloud>
2025-07-21 22:45:36 +00:00
2 changed files with 27 additions and 68 deletions

View File

@@ -1,68 +0,0 @@
From a2a7cdf9e292bac5b146738276a593d8e119fe8f Mon Sep 17 00:00:00 2001
From: Marek Kwaczynski <marek@shasta.cloud>
Date: Thu, 3 Jul 2025 15:55:43 +0000
Subject: [PATCH] netifd: add gcmp-256 as a cipher suite when SAE is enabled on
HE/EHT
Enabling gcmp-256 only on 6GHz radio.
Fixes: WIFI-14594
Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>
---
.../config/netifd/patches/200-gcmp-256.patch | 43 +++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 package/network/config/netifd/patches/200-gcmp-256.patch
diff --git a/package/network/config/netifd/patches/200-gcmp-256.patch b/package/network/config/netifd/patches/200-gcmp-256.patch
new file mode 100644
index 0000000000..7ac6262e7f
--- /dev/null
+++ b/package/network/config/netifd/patches/200-gcmp-256.patch
@@ -0,0 +1,43 @@
+Index: netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
+===================================================================
+--- netifd-2023-09-19-8587c074.orig/scripts/netifd-wireless.sh
++++ netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
+@@ -39,11 +39,10 @@ prepare_key_wep() {
+ }
+
+ _wdev_prepare_channel() {
+- json_get_vars channel band hwmode
++ json_get_vars channel band hwmode htmode
+
+ auto_channel=0
+ enable_ht=0
+- htmode=
+ hwmode="${hwmode##11}"
+
+ case "$channel" in
+@@ -70,7 +69,14 @@ _wdev_prepare_channel() {
+
+ case "$band" in
+ 2g) hwmode=g;;
+- 5g|6g) hwmode=a;;
++ 5g) hwmode=a;;
++ 6g)
++ hwmode=a;
++ case "$htmode" in
++ HE*|EHT*) wpa3_cipher="GCMP-256 ";;
++ *) wpa3_cipher="";;
++ esac
++ ;;
+ 60g) hwmode=ad;;
+ *)
+ case "$hwmode" in
+@@ -216,6 +222,9 @@ wireless_vif_parse_encryption() {
+ wpa_cipher="GCMP"
+ else
+ wpa_cipher="CCMP"
++ case "$encryption" in
++ sae*|wpa3*|psk3*|owe) wpa_cipher="${wpa3_cipher}$wpa_cipher";;
++ esac
+ fi
+
+ case "$encryption" in
--
2.43.0

View File

@@ -0,0 +1,27 @@
From 0f590999ea33fb91160aec123a9a74c31623584e Mon Sep 17 00:00:00 2001
From: Paul White <paul@shasta.cloud>
Date: Mon, 21 Jul 2025 22:41:52 +0000
Subject: [PATCH] feeds.default.conf: switch to using git:// instead of
https://
Signed-off-by: Paul White <paul@shasta.cloud>
---
feeds.conf.default | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/feeds.conf.default b/feeds.conf.default
index d467db5627..bafcf8aa98 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05
+src-git packages git://git.openwrt.org/feed/packages.git;openwrt-23.05
+src-git luci git://git.openwrt.org/project/luci.git;openwrt-23.05
+src-git routing git://git.openwrt.org/feed/routing.git;openwrt-23.05
+src-git telephony git://git.openwrt.org/feed/telephony.git;openwrt-23.05
--
2.43.0