diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf index 88e9b734199c3da4da42dc64359d5301a3768f08..c9381d93daa0d331ef17b9619dda635d1dccf459 100644 --- a/docs/site-example/site.conf +++ b/docs/site-example/site.conf @@ -35,13 +35,6 @@ -- Wireless channel. channel = 1, - -- Specifies the channel width in 802.11n and 802.11ac mode. - -- Possible values are: - -- HT20 (single 20MHz channel), - -- HT40- (2x 20MHz channels, secondary below) - -- HT40+ (2x 20MHz channels, secondary above) - htmode = 'HT20', - -- ESSID used for client network. ap = { ssid = 'entenhausen.freifunk.net', @@ -58,10 +51,9 @@ -- Wireless configuration for 5 GHz interfaces. -- This should be equal to the 2.4 GHz variant, except - -- for channel and htmode. + -- for channel. wifi5 = { channel = 44, - htmode = 'HT20', ap = { ssid = 'entenhausen.freifunk.net', }, diff --git a/docs/user/site.rst b/docs/user/site.rst index bcc811224a7cc93eb68eb36c8ab167ba45b67bf8..6219009365756563dfbdf1d3baefa96c8b8e5544 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -83,7 +83,6 @@ regdom : optional wifi24 : optional WLAN configuration for 2.4 GHz devices. ``channel`` must be set to a valid wireless channel for your radio. - ``htmode`` selects the desired htmode (e.g. HT20, HT40- or HT40+). There are currently three interface types available. You many choose to configure any subset of them: @@ -108,7 +107,6 @@ wifi24 : optional wifi24 = { channel = 11, - htmode = 'HT20', ap = { ssid = 'entenhausen.freifunk.net', }, diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua index e752dd26f022d0c8bbe4af5fbf538039ed6cf41a..1647d778e14d3d3c4b63ca7db65ac03273352df9 100644 --- a/package/gluon-core/check_site.lua +++ b/package/gluon-core/check_site.lua @@ -28,6 +28,5 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do need_string('regdom') -- regdom is only required when wifi24 or wifi5 is configured need_number(config .. '.channel') - need_string(config .. '.htmode') end end diff --git a/package/gluon-core/files/lib/gluon/upgrade/200-wireless b/package/gluon-core/files/lib/gluon/upgrade/200-wireless index ad47bb01bd59588262ba51b104940547f1dee7a1..1225fefde444bdccd57078e079e7d4d9ede688c7 100755 --- a/package/gluon-core/files/lib/gluon/upgrade/200-wireless +++ b/package/gluon-core/files/lib/gluon/upgrade/200-wireless @@ -17,7 +17,7 @@ local function configure_radio(radio, index, config) uci:delete('wireless', radio, 'disabled') uci:set('wireless', radio, 'channel', config.channel) - uci:set('wireless', radio, 'htmode', config.htmode) + uci:set('wireless', radio, 'htmode', 'HT20') uci:set('wireless', radio, 'country', site.regdom) end end