From b31b23664644f20bf05d000cd29913fef0884dfc Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 29 Sep 2021 15:20:50 +0200 Subject: [PATCH] mac80211: do not hard abort when iw times out Signed-off-by: John Crispin --- .../0018-mac80211-update-to-latest-HEAD.patch | 19 ++++++++++++++----- .../files/lib/netifd/wireless/mac80211.sh | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/backports/0018-mac80211-update-to-latest-HEAD.patch b/backports/0018-mac80211-update-to-latest-HEAD.patch index 83494eef9..ba73885a4 100644 --- a/backports/0018-mac80211-update-to-latest-HEAD.patch +++ b/backports/0018-mac80211-update-to-latest-HEAD.patch @@ -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 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 --- @@ -9,7 +9,7 @@ Signed-off-by: John Crispin package/kernel/mac80211/ath.mk | 5 +- package/kernel/mac80211/broadcom.mk | 4 +- .../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 +- .../patches/ath/120-owl-loader-compat.patch | 53 - .../patches/ath/402-ath_regd_optional.patch | 2 +- @@ -75,7 +75,7 @@ Signed-off-by: John Crispin ...eck-per-vif-offload_flags-in-Tx-path.patch | 26 + .../500-mac80211_configure_antenna_gain.patch | 16 +- ...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/patches/ath/120-owl-loader-compat.patch rename package/kernel/mac80211/patches/{ath => ath10k}/080-ath10k_thermal_config.patch (97%) @@ -286,7 +286,7 @@ index 92e5c0e395..0000000000 - done -} 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 +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -1,7 +1,6 @@ @@ -535,6 +535,15 @@ index 9a9c35fb5f..a58af1fef0 100644 [ -n "$phy" ] && return 0 } [ -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() { case "$htmode" in VHT20|HT20) iw_htmode=HT20;; diff --git a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh index a58af1fef..a25e4ff9b 100644 --- a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -630,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 }