[openwrt/openwrt] mac80211: select the first available channel for 5GHz interfaces

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/cd36c0d2f093ec6b8a2c6e9b7b300a2fd4fc87b3

commit cd36c0d2f093ec6b8a2c6e9b7b300a2fd4fc87b3
Author: Davide Fioravanti <pantanastyle at gmail.com>
AuthorDate: Thu Sep 17 15:40:27 2020 +0200

    mac80211: select the first available channel for 5GHz interfaces
    
    Some 5GHz wifi interfaces, especially in Tri-band routers, can't use
    channel 36. In these cases, the default configuration for 5GHz
    interfaces, once enabled, doesn't work.
    
    This patch selects the first non-disabled channel for 5GHz interfaces.
    
    Signed-off-by: Davide Fioravanti <pantanastyle at gmail.com>
---
 package/kernel/mac80211/files/lib/wifi/mac80211.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index be9c537926..c0fbfbe5a8 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -82,9 +82,9 @@ detect_mac80211() {
 
 		iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT20
 
-		iw phy "$dev" info | grep -q '5180 MHz' && {
+		iw phy "$dev" info | grep -q '\* 5... MHz \[' && {
 			mode_band="a"
-			channel="36"
+			channel=$(iw phy "$dev" info | grep '\* 5... MHz \[' | grep '(disabled)' -v -m 1 | sed 's/[^[]*\[\|\].*//g')
 			iw phy "$dev" info | grep -q 'VHT Capabilities' && htmode="VHT80"
 		}