2.4 ghz working, 5ghz could not set country code
This commit is contained in:
parent
69269c05a8
commit
1d47d4a5b8
7 changed files with 42 additions and 18 deletions
15
hardware/wle-regulatory-domain/default.nix
Normal file
15
hardware/wle-regulatory-domain/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{ config, lib, pkgs, ... }: {
|
||||||
|
boot.kernelPatches = [{
|
||||||
|
name = "ath10k-override-eeprom-regulatory-domain";
|
||||||
|
patch = ./ath10k-override-eeprom-regulatory-domain.patch;
|
||||||
|
extraConfig = ''
|
||||||
|
EXPERT y
|
||||||
|
CFG80211_CERTIFICATION_ONUS y
|
||||||
|
ATH_REG_DYNAMIC_USER_REG_HINTS y
|
||||||
|
ATH_REG_DYNAMIC_USER_CERT_TESTING y
|
||||||
|
ATH_REG_DYNAMIC_USER_CERT_TESTING y
|
||||||
|
ATH9K_DFS_CERTIFIED y
|
||||||
|
ATH10K_DFS_CERTIFIED y
|
||||||
|
'';
|
||||||
|
}];
|
||||||
|
}
|
|
@ -1,7 +1,11 @@
|
||||||
# Note: You can either use wel600vx.nix or wle900vx.nix
|
# Note: You can either use wel600vx.nix or wle900vx.nix
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
#TODO!
|
imports = [
|
||||||
|
./wle-regulatory-domain
|
||||||
|
];
|
||||||
|
|
||||||
services.hostapd5ghz.extraConfig = ''
|
services.hostapd5ghz.extraConfig = ''
|
||||||
ht_capab=[LDPC][HT40][SMPS-STATIC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][DSSS_CCK-40]
|
ht_capab=[LDPC][HT40][SMPS-STATIC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][DSSS_CCK-40]
|
||||||
|
fragm_threshold=-1
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,7 @@
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
boot.kernelPatches = [{
|
imports = [
|
||||||
name = "ath10k-override-eeprom-regulatory-domain";
|
./wle-regulatory-domain
|
||||||
patch = ./wle900vx/ath10k-override-eeprom-regulatory-domain.patch;
|
];
|
||||||
extraConfig = ''
|
|
||||||
EXPERT y
|
|
||||||
CFG80211_CERTIFICATION_ONUS y
|
|
||||||
ATH_REG_DYNAMIC_USER_REG_HINTS y
|
|
||||||
ATH_REG_DYNAMIC_USER_CERT_TESTING y
|
|
||||||
ATH_REG_DYNAMIC_USER_CERT_TESTING y
|
|
||||||
'';
|
|
||||||
}];
|
|
||||||
|
|
||||||
services.hostapd5ghz.extraConfig = ''
|
services.hostapd5ghz.extraConfig = ''
|
||||||
ht_capab=[LDPC][HT40+][SHORT-GI-20][SHORT-GI-40][TX-STBC][DSSS_CCK-40]
|
ht_capab=[LDPC][HT40+][SHORT-GI-20][SHORT-GI-40][TX-STBC][DSSS_CCK-40]
|
||||||
|
|
|
@ -16,10 +16,26 @@
|
||||||
../role/router-wireless-ap
|
../role/router-wireless-ap
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nix.distributedBuilds = true;
|
||||||
|
|
||||||
|
nix.buildMachines = [ {
|
||||||
|
hostName = "10.2.1.38";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
sshUser = "fhauser";
|
||||||
|
sshKey = "/root/.ssh/id_ed25519";
|
||||||
|
# if the builder supports building for multiple architectures,
|
||||||
|
# replace the previous line by, e.g.,
|
||||||
|
# systems = ["x86_64-linux" "aarch64-linux"];
|
||||||
|
maxJobs = 4;
|
||||||
|
speedFactor = 2;
|
||||||
|
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||||
|
mandatoryFeatures = [ ];
|
||||||
|
}] ;
|
||||||
|
|
||||||
services.router = {
|
services.router = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wanInterface = "enp2s0";
|
wanInterface = "enp2s0";
|
||||||
wirelessInterfaces = [ "wlp4s0" "wlp6s0" ];
|
#wirelessInterfaces = [ "wlp4s0" "wlp6s0" ];
|
||||||
lanInterfaces = [ "enp1s0" "enp3s0" ];
|
lanInterfaces = [ "enp1s0" "enp3s0" ];
|
||||||
internalRouterIP = "10.2.2.1";
|
internalRouterIP = "10.2.2.1";
|
||||||
dhcp = {
|
dhcp = {
|
||||||
|
@ -36,7 +52,7 @@
|
||||||
wleInterface24Ghz = "wlp4s0";
|
wleInterface24Ghz = "wlp4s0";
|
||||||
wleInterface5Ghz = "wlp6s0";
|
wleInterface5Ghz = "wlp6s0";
|
||||||
ssid = "testnet";
|
ssid = "testnet";
|
||||||
passphrase = "testnet";
|
passphrase = "testnettestnet";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
parted
|
parted
|
||||||
borgbackup
|
borgbackup
|
||||||
nixfmt
|
nixfmt
|
||||||
|
iw
|
||||||
];
|
];
|
||||||
|
|
||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
|
|
|
@ -72,8 +72,6 @@ in {
|
||||||
wpaPassphrase = cfg.passphrase;
|
wpaPassphrase = cfg.passphrase;
|
||||||
channel = 36;
|
channel = 36;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
${optionalString wle24GhzEnabled
|
|
||||||
"except-interface=${cfg.wleInterface24Ghz}"}
|
|
||||||
max_num_sta=255
|
max_num_sta=255
|
||||||
|
|
||||||
#Details for Connecting Clients via WPA2 TKIP
|
#Details for Connecting Clients via WPA2 TKIP
|
||||||
|
@ -144,8 +142,6 @@ in {
|
||||||
wpaPassphrase = cfg.passphrase;
|
wpaPassphrase = cfg.passphrase;
|
||||||
channel = 6;
|
channel = 6;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
${optionalString wle5GhzEnabled
|
|
||||||
"except-interface=${cfg.wleInterface5Ghz}"}
|
|
||||||
|
|
||||||
#macaddr_acl sets options for mac address filtering. 0 means "accept unless in deny list"
|
#macaddr_acl sets options for mac address filtering. 0 means "accept unless in deny list"
|
||||||
macaddr_acl=0
|
macaddr_acl=0
|
||||||
|
|
Loading…
Add table
Reference in a new issue