luci-mod-network: wireless.js: match AP channel and htmode on join

Set a matching HT mode and channel number on joining a wireless network.

Fixes: #7066
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 7269a1fb45cc1a6ce093ead426f0f7481753be90..97f46ec9cfbb4f6f1b1befcfe4afaa259ffad334 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -2030,6 +2030,26 @@ return view.extend({
                                        uci.unset('wireless', radioDev.getName(), 'disabled');
                                }
 
+                               var htmodes = radioDev.getHTModes();
+
+                               if (bss.vht_operation && htmodes && htmodes.indexOf('VHT20') !== -1) {
+                                       for (var w = bss.vht_operation.channel_width; w >= 20; w /= 2) {
+                                               if (htmodes.indexOf('VHT'+w) !== -1) {
+                                                       uci.set('wireless', radioDev.getName(), 'htmode', 'VHT'+w);
+                                                       break;
+                                               }
+                                       }
+                               }
+                               else if (bss.ht_operation && htmodes && htmodes.indexOf('HT20') !== -1) {
+                                       var w = (bss.ht_operation.secondary_channel_offset == 'no secondary') ? 20 : 40;
+                                       uci.set('wireless', radioDev.getName(), 'htmode', 'HT'+w);
+                               }
+                               else {
+                                       uci.remove('wireless', radioDev.getName(), 'htmode');
+                               }
+
+                               uci.set('wireless', radioDev.getName(), 'channel', bss.channel);
+
                                section_id = next_free_sid(wifi_sections.length);
 
                                uci.add('wireless', 'wifi-iface', section_id);