From 4dbc45a217572c7a6221bf66f6e130a2617e1eb5 Mon Sep 17 00:00:00 2001 From: Vasil Kolev Date: Mon, 28 Oct 2019 12:18:30 +0200 Subject: [PATCH] Revert "Hack for .11ac channels" Not needed any more. This reverts commit 42ef0793c78c765a31623a621ed31ea0df81fbc0. --- Rakefile | 22 +++------------------- archer-c5.configdiff | 3 +-- archer-c7.configdiff | 3 +-- configurations.yml | 26 +++++++++++++------------- dap2965.configdiff | 3 +-- files/archer-c5/etc/config/wireless | 5 +---- files/dap2965/etc/config/wireless | 5 +---- files/linksys/etc/config/wireless | 5 +---- linksys.configdiff | 3 +-- wdr4300.configdiff | 3 +-- wr1043-nd.configdiff | 3 +-- 11 files changed, 25 insertions(+), 56 deletions(-) diff --git a/Rakefile b/Rakefile index 39251a3..00376d1 100644 --- a/Rakefile +++ b/Rakefile @@ -15,28 +15,12 @@ def wifi(name) wlans = CONFIGURATIONS[name]['wlans'] wlan_config = File.read(config_path) - # TODO: hack for 11ac channels, make more generic - fiveg_channels = {} - fiveg_channels['42'] = [36, 40, 44, 48] - fiveg_channels['58'] = [52, 56, 60, 64] - fiveg_channels['106'] = [100, 104, 108, 112] - fiveg_channels['122'] = [116, 120, 124, 128] - fiveg_channels['138'] = [132, 136, 140, 144] - fiveg_channels['155'] = [149, 153, 157, 161] - wlans.each do |id, wlan| + wlan_config.sub!("", wlan['channel'].to_s) wlan_config.sub!("", wlan['bssid'].to_s) - # 2.4 GHz - if id == 1 - wlan_config.sub!("", wlan['channel'].to_s) - # 5 GHz - else - channels = fiveg_channels[wlan['channel'].to_s] - (0..3).each do |chan| - wlan_config.sub!("", channels[chan].to_s) - end - end end + #wlan_config.gsub!("# option channel", " option channel") + wlan_config.gsub!("# option macaddr", " option macaddr") File.open(config_path, 'w') do |f| f.puts wlan_config diff --git a/archer-c5.configdiff b/archer-c5.configdiff index b109533..b8baec8 100644 --- a/archer-c5.configdiff +++ b/archer-c5.configdiff @@ -95,5 +95,4 @@ CONFIG_VERSION_MANUFACTURER_URL="" CONFIG_VERSION_PRODUCT="" CONFIG_VERSION_SUPPORT_URL="" CONFIG_WPA_SUPPLICANT_INTERNAL=y -CONFIG_VERSION_REPO="http://mirrors.linux-bulgaria.org/lede/releases/17.01.4" -CONFIG_PACKAGE_wifi-sentinel=y +CONFIG_VERSION_REPO="https://mirrors.linux-bulgaria.org/lede/releases/17.01.4" diff --git a/archer-c7.configdiff b/archer-c7.configdiff index 1d3c4d9..284962a 100644 --- a/archer-c7.configdiff +++ b/archer-c7.configdiff @@ -95,5 +95,4 @@ CONFIG_VERSION_MANUFACTURER_URL="" CONFIG_VERSION_PRODUCT="" CONFIG_VERSION_SUPPORT_URL="" CONFIG_WPA_SUPPLICANT_INTERNAL=y -CONFIG_VERSION_REPO="http://mirrors.linux-bulgaria.org/lede/releases/17.01.4" -CONFIG_PACKAGE_wifi-sentinel=y +CONFIG_VERSION_REPO="https://mirrors.linux-bulgaria.org/lede/releases/17.01.4" diff --git a/configurations.yml b/configurations.yml index abe22b2..ce09a08 100644 --- a/configurations.yml +++ b/configurations.yml @@ -7,7 +7,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:10:00 - channel: 106 + channel: 108 1: bssid: 02:00:0f:20:10:01 channel: 13 @@ -21,7 +21,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:10:10 - channel: 58 + channel: 60 1: bssid: 02:00:0f:20:10:11 channel: 5 @@ -36,7 +36,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:20:00 - channel: 122 + channel: 124 1: bssid: 02:00:0f:20:20:01 channel: 5 @@ -50,7 +50,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:20:10 - channel: 42 + channel: 44 1: bssid: 02:00:0f:20:20:11 channel: 1 @@ -64,7 +64,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:20:20 - channel: 106 + channel: 108 1: bssid: 02:00:0f:20:20:21 channel: 9 @@ -78,7 +78,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:20:30 - channel: 58 + channel: 60 1: bssid: 02:00:0f:20:20:31 channel: 13 @@ -93,7 +93,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:30:00 - channel: 42 + channel: 44 1: bssid: 02:00:0f:20:30:01 channel: 1 @@ -107,7 +107,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:30:10 - channel: 58 + channel: 60 1: bssid: 02:00:0f:20:30:11 channel: 1 @@ -122,7 +122,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:40:00 - channel: 42 + channel: 44 1: bssid: 02:00:0f:20:40:01 channel: 1 @@ -136,7 +136,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:40:10 - channel: 42 + channel: 44 1: bssid: 02:00:0f:20:40:11 channel: 1 @@ -151,7 +151,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:50:00 - channel: 42 + channel: 44 1: bssid: 02:00:0f:20:50:01 channel: 9 @@ -165,7 +165,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:50:10 - channel: 106 + channel: 108 1: bssid: 02:00:0f:20:50:11 channel: 1 @@ -180,7 +180,7 @@ configurations: wlans: 0: bssid: 02:00:0f:20:50:20 - channel: 106 + channel: 108 1: bssid: 02:00:0f:20:50:21 channel: 13 diff --git a/dap2965.configdiff b/dap2965.configdiff index 45dd474..3be106d 100644 --- a/dap2965.configdiff +++ b/dap2965.configdiff @@ -80,5 +80,4 @@ CONFIG_PACKAGE_wpad=y # CONFIG_PACKAGE_wpad-mini is not set CONFIG_PACKAGE_zlib=y CONFIG_WPA_SUPPLICANT_INTERNAL=y -CONFIG_VERSION_REPO="http://mirrors.linux-bulgaria.org/lede/releases/17.01.4" -CONFIG_PACKAGE_wifi-sentinel=y +CONFIG_VERSION_REPO="https://mirrors.linux-bulgaria.org/lede/releases/17.01.4" diff --git a/files/archer-c5/etc/config/wireless b/files/archer-c5/etc/config/wireless index ea7522c..9d354f3 100644 --- a/files/archer-c5/etc/config/wireless +++ b/files/archer-c5/etc/config/wireless @@ -2,10 +2,7 @@ config wifi-device radio0 option type mac80211 option hwmode 11a option path 'pci0000:01/0000:01:00.0' - list channels '' - list channels '' - list channels '' - list channels '' + option channel option txpower '30' option htmode VHT80 option distance '20' diff --git a/files/dap2965/etc/config/wireless b/files/dap2965/etc/config/wireless index e0ec7ca..50844c4 100644 --- a/files/dap2965/etc/config/wireless +++ b/files/dap2965/etc/config/wireless @@ -2,10 +2,7 @@ config wifi-device radio0 option type mac80211 option hwmode 11a option path 'pci0000:00/0000:00:00.0' - list channels '' - list channels '' - list channels '' - list channels '' + option channel option txpower '30' option htmode VHT80 option distance '20' diff --git a/files/linksys/etc/config/wireless b/files/linksys/etc/config/wireless index 4a558a4..8d49740 100644 --- a/files/linksys/etc/config/wireless +++ b/files/linksys/etc/config/wireless @@ -2,10 +2,7 @@ config wifi-device radio0 option type mac80211 option hwmode 11a option path 'soc/soc:pcie-controller/pci0000:00/0000:00:01.0/0000:01:00.0' - list channels '' - list channels '' - list channels '' - list channels '' + option channel option txpower '30' option htmode VHT80 option distance '20' diff --git a/linksys.configdiff b/linksys.configdiff index 7663f79..d307ada 100644 --- a/linksys.configdiff +++ b/linksys.configdiff @@ -74,6 +74,5 @@ CONFIG_PACKAGE_wpa-cli=y CONFIG_PACKAGE_wpad=y # CONFIG_PACKAGE_wpad-mini is not set CONFIG_PACKAGE_zlib=y -CONFIG_VERSION_REPO="http://mirrors.linux-bulgaria.org/lede/releases/17.01.4" +CONFIG_VERSION_REPO="https://mirrors.linux-bulgaria.org/lede/releases/17.01.4" CONFIG_WPA_SUPPLICANT_INTERNAL=y -CONFIG_PACKAGE_wifi-sentinel=y diff --git a/wdr4300.configdiff b/wdr4300.configdiff index f10aa26..13cb8f8 100644 --- a/wdr4300.configdiff +++ b/wdr4300.configdiff @@ -108,7 +108,6 @@ CONFIG_VERSION_MANUFACTURER="" CONFIG_VERSION_NICK="Chaos Calmer" CONFIG_VERSION_NUMBER="15.05" CONFIG_VERSION_PRODUCT="" -CONFIG_VERSION_REPO="http://mirrors.linux-bulgaria.org/lede/releases/17.01.4" -CONFIG_PACKAGE_wifi-sentinel=y +CONFIG_VERSION_REPO="https://mirrors.linux-bulgaria.org/lede/releases/17.01.4" CONFIG_WPA_SUPPLICANT_INTERNAL=y # CONFIG_IB_STANDALONE is not set diff --git a/wr1043-nd.configdiff b/wr1043-nd.configdiff index 163c0f7..62a29da 100644 --- a/wr1043-nd.configdiff +++ b/wr1043-nd.configdiff @@ -105,6 +105,5 @@ CONFIG_VERSION_MANUFACTURER="" CONFIG_VERSION_NICK="Chaos Calmer" CONFIG_VERSION_NUMBER="15.05" CONFIG_VERSION_PRODUCT="" -CONFIG_VERSION_REPO="http://mirrors.linux-bulgaria.org/lede/releases/17.01.4" -CONFIG_PACKAGE_wifi-sentinel=y +CONFIG_VERSION_REPO="https://mirrors.linux-bulgaria.org/lede/releases/17.01.4" CONFIG_WPA_SUPPLICANT_INTERNAL=y