mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-30 18:07:52 +00:00
Compare commits
5 Commits
v2.2.0-rc1
...
v2.2.0-rc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
406dad6604 | ||
|
|
b31b236646 | ||
|
|
0c379ed26c | ||
|
|
647d5c8a33 | ||
|
|
7baf962bb8 |
13
.github/workflows/build-dev.yml
vendored
13
.github/workflows/build-dev.yml
vendored
@@ -61,3 +61,16 @@ jobs:
|
|||||||
|
|
||||||
[ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/octet-stream" "openwrt/$(cat openwrt/tmp/image-file)" "s3://$AWS_S3_BUCKET_NAME/$IMG_NAME"
|
[ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/octet-stream" "openwrt/$(cat openwrt/tmp/image-file)" "s3://$AWS_S3_BUCKET_NAME/$IMG_NAME"
|
||||||
[ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/json" "latest-upgrade.json" "s3://$AWS_S3_BUCKET_NAME/$JSON_NAME"
|
[ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/json" "latest-upgrade.json" "s3://$AWS_S3_BUCKET_NAME/$JSON_NAME"
|
||||||
|
|
||||||
|
trigger-testing:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build
|
||||||
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
|
steps:
|
||||||
|
- name: Trigger testing of release
|
||||||
|
uses: peter-evans/repository-dispatch@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.WLAN_TESTING_PAT }}
|
||||||
|
repository: Telecominfraproject/wlan-testing
|
||||||
|
event-type: new-ap-release
|
||||||
|
client-payload: '{"ref": "${GITHUB_REF#refs/tags/}", "sha": "${{ github.sha }}"}'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
From 85aa45ef0dc90e50e9ac0931fd2a8c99c764e101 Mon Sep 17 00:00:00 2001
|
From 39af14f6e40bcb97772dcc0c03849fbf6aa0032b Mon Sep 17 00:00:00 2001
|
||||||
From: John Crispin <john@phrozen.org>
|
From: John Crispin <john@phrozen.org>
|
||||||
Date: Thu, 27 May 2021 13:24:47 +0200
|
Date: Thu, 27 May 2021 13:24:47 +0200
|
||||||
Subject: [PATCH 01/58] netifd: update to latest HEAD
|
Subject: [PATCH 01/58] netifd: update to latest HEAD
|
||||||
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
|||||||
create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch
|
create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch
|
||||||
|
|
||||||
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
|
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
|
||||||
index 4b5f110da2..276633cfa7 100644
|
index 4b5f110da2..d0ddec8f61 100644
|
||||||
--- a/package/network/config/netifd/Makefile
|
--- a/package/network/config/netifd/Makefile
|
||||||
+++ b/package/network/config/netifd/Makefile
|
+++ b/package/network/config/netifd/Makefile
|
||||||
@@ -5,16 +5,14 @@ PKG_RELEASE:=1
|
@@ -5,16 +5,14 @@ PKG_RELEASE:=1
|
||||||
@@ -22,8 +22,8 @@ index 4b5f110da2..276633cfa7 100644
|
|||||||
-PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
|
-PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
|
||||||
-PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
|
-PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
|
||||||
+PKG_SOURCE_DATE:=2021-09-01
|
+PKG_SOURCE_DATE:=2021-09-01
|
||||||
+PKG_SOURCE_VERSION:=5a4ac30c7a15712d01110befec1acfe86c2cbed0
|
+PKG_SOURCE_VERSION:=e467e0ff44c00cdd722e7149baaa8706d44e657e
|
||||||
+PKG_MIRROR_HASH:=888d40c88997a628be2a6d7f7a1de1c7fed742f4c19312c52cdf5a72b26a96af
|
+PKG_MIRROR_HASH:=cde5c1c1609c29f24171dcd97d2264e28a6dfb724e25f4bd3c2be351b6dd4f10
|
||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 4381103753770dab05cb94045a60573e4863fca5 Mon Sep 17 00:00:00 2001
|
From 6718e9786f18dd1380e5977d224d13a5ff3df619 Mon Sep 17 00:00:00 2001
|
||||||
From: John Crispin <john@phrozen.org>
|
From: John Crispin <john@phrozen.org>
|
||||||
Date: Sat, 4 Sep 2021 05:47:27 +0200
|
Date: Sat, 4 Sep 2021 05:47:27 +0200
|
||||||
Subject: [PATCH 01/53] mac80211: update to latest HEAD
|
Subject: [PATCH 02/58] mac80211: update to latest HEAD
|
||||||
|
|
||||||
Signed-off-by: John Crispin <john@phrozen.org>
|
Signed-off-by: John Crispin <john@phrozen.org>
|
||||||
---
|
---
|
||||||
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
|||||||
package/kernel/mac80211/ath.mk | 5 +-
|
package/kernel/mac80211/ath.mk | 5 +-
|
||||||
package/kernel/mac80211/broadcom.mk | 4 +-
|
package/kernel/mac80211/broadcom.mk | 4 +-
|
||||||
.../mac80211/files/lib/netifd/mac80211.sh | 36 -
|
.../mac80211/files/lib/netifd/mac80211.sh | 36 -
|
||||||
.../files/lib/netifd/wireless/mac80211.sh | 184 ++-
|
.../files/lib/netifd/wireless/mac80211.sh | 186 ++-
|
||||||
.../mac80211/files/lib/wifi/mac80211.sh | 110 +-
|
.../mac80211/files/lib/wifi/mac80211.sh | 110 +-
|
||||||
.../patches/ath/120-owl-loader-compat.patch | 53 -
|
.../patches/ath/120-owl-loader-compat.patch | 53 -
|
||||||
.../patches/ath/402-ath_regd_optional.patch | 2 +-
|
.../patches/ath/402-ath_regd_optional.patch | 2 +-
|
||||||
@@ -75,7 +75,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
|||||||
...eck-per-vif-offload_flags-in-Tx-path.patch | 26 +
|
...eck-per-vif-offload_flags-in-Tx-path.patch | 26 +
|
||||||
.../500-mac80211_configure_antenna_gain.patch | 16 +-
|
.../500-mac80211_configure_antenna_gain.patch | 16 +-
|
||||||
...the-dst-buffer-to-of_get_mac_address.patch | 237 +++
|
...the-dst-buffer-to-of_get_mac_address.patch | 237 +++
|
||||||
70 files changed, 2751 insertions(+), 1159 deletions(-)
|
70 files changed, 2752 insertions(+), 1160 deletions(-)
|
||||||
delete mode 100644 package/kernel/mac80211/files/lib/netifd/mac80211.sh
|
delete mode 100644 package/kernel/mac80211/files/lib/netifd/mac80211.sh
|
||||||
delete mode 100644 package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
|
delete mode 100644 package/kernel/mac80211/patches/ath/120-owl-loader-compat.patch
|
||||||
rename package/kernel/mac80211/patches/{ath => ath10k}/080-ath10k_thermal_config.patch (97%)
|
rename package/kernel/mac80211/patches/{ath => ath10k}/080-ath10k_thermal_config.patch (97%)
|
||||||
@@ -286,7 +286,7 @@ index 92e5c0e395..0000000000
|
|||||||
- done
|
- done
|
||||||
-}
|
-}
|
||||||
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
|
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
|
||||||
index 9a9c35fb5f..a58af1fef0 100644
|
index 9a9c35fb5f..a25e4ff9b2 100644
|
||||||
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
|
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
|
||||||
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
|
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
|
||||||
@@ -1,7 +1,6 @@
|
@@ -1,7 +1,6 @@
|
||||||
@@ -535,6 +535,15 @@ index 9a9c35fb5f..a58af1fef0 100644
|
|||||||
[ -n "$phy" ] && return 0
|
[ -n "$phy" ] && return 0
|
||||||
}
|
}
|
||||||
[ -n "$macaddr" ] && {
|
[ -n "$macaddr" ] && {
|
||||||
|
@@ -528,7 +630,7 @@ mac80211_iw_interface_add() {
|
||||||
|
rc="$?"
|
||||||
|
}
|
||||||
|
|
||||||
|
- [ "$rc" != 0 ] && wireless_setup_failed INTERFACE_CREATION_FAILED
|
||||||
|
+ [ "$rc" != 0 ] && echo "Failed to create interface $ifname"
|
||||||
|
return $rc
|
||||||
|
}
|
||||||
|
|
||||||
@@ -689,14 +791,8 @@ mac80211_prepare_iw_htmode() {
|
@@ -689,14 +791,8 @@ mac80211_prepare_iw_htmode() {
|
||||||
case "$htmode" in
|
case "$htmode" in
|
||||||
VHT20|HT20) iw_htmode=HT20;;
|
VHT20|HT20) iw_htmode=HT20;;
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ URL="https://api.fbwifi.com/v2.0/tokens"
|
|||||||
BODY=string.format(
|
BODY=string.format(
|
||||||
"tokens=%s&traffic_type=%s&config_version=%s",
|
"tokens=%s&traffic_type=%s&config_version=%s",
|
||||||
json.encode(request.tokens),
|
json.encode(request.tokens),
|
||||||
"'total'",
|
"total",
|
||||||
state:get("fbwifi", "main", "config_version")
|
state:get("fbwifi", "main", "config_version")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -21,3 +21,4 @@ config chilli
|
|||||||
option kname 'chilli'
|
option kname 'chilli'
|
||||||
option debug 0
|
option debug 0
|
||||||
EOF
|
EOF
|
||||||
|
/etc/init.d/chilli disable
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
[ "$ACTION" == "ifup" ] || exit 0
|
[ "$ACTION" == "ifup" ] || exit 0
|
||||||
|
|
||||||
[ "$INTERFACE" = "wan" ] && {
|
[ "$INTERFACE" = "wan" -a "$(uci get chilli.@chilli[-1].disabled)" -neq 0 ] && {
|
||||||
/etc/init.d/chilli restart
|
/etc/init.d/chilli restart
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -630,7 +630,7 @@ mac80211_iw_interface_add() {
|
|||||||
rc="$?"
|
rc="$?"
|
||||||
}
|
}
|
||||||
|
|
||||||
[ "$rc" != 0 ] && wireless_setup_failed INTERFACE_CREATION_FAILED
|
[ "$rc" != 0 ] && echo "Failed to create interface $ifname"
|
||||||
return $rc
|
return $rc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user