scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-31 10:28:06 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

mac80211: do not hard abort when iw times out

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-09-29 15:20:50 +02:00
parent 0c379ed26c
commit b31b236646
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backports/0018-mac80211-update-to-latest-HEAD.patch
View File

@@ -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;;

2
feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@@ -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
} }