Browse Source

Drop htmode field from config, always use HT20

Fixes #487
Matthias Schiffer 8 years ago
parent
commit
3ddcf50b80

+ 1 - 9
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',
     },

+ 0 - 2
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',
          },

+ 0 - 1
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

+ 1 - 1
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