fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

2.4 ghz working, 5ghz could not set country code

Browse source
This commit is contained in:
Fabian Hauser 2020-07-15 17:18:43 +00:00
parent 69269c05a8
commit 1d47d4a5b8
7 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
hardware/wle900vx/ath10k-override-eeprom-regulatory-domain.patch → hardware/wle-regulatory-domain/ath10k-override-eeprom-regulatory-domain.patch
View file

15
hardware/wle-regulatory-domain/default.nix Normal file
View 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
'';
}];
}

6
hardware/wle600vx.nix
View file

@ -1,7 +1,11 @@
# Note: You can either use wel600vx.nix or wle900vx.nix
{ config, lib, pkgs, ... }: {
#TODO!
imports = [
./wle-regulatory-domain
];
services.hostapd5ghz.extraConfig = ''
ht_capab=[LDPC][HT40][SMPS-STATIC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][DSSS_CCK-40]
fragm_threshold=-1
'';
}

14
hardware/wle900vx.nix
View file

@ -1,15 +1,7 @@
{ config, lib, pkgs, ... }: {
boot.kernelPatches = [{
name = "ath10k-override-eeprom-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
'';
}];
imports = [
./wle-regulatory-domain
];
services.hostapd5ghz.extraConfig = ''
ht_capab=[LDPC][HT40+][SHORT-GI-20][SHORT-GI-40][TX-STBC][DSSS_CCK-40]

20
host/etzel.nix
View file

@ -16,10 +16,26 @@
../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 = {
enable = true;
wanInterface = "enp2s0";
wirelessInterfaces = [ "wlp4s0" "wlp6s0" ];
#wirelessInterfaces = [ "wlp4s0" "wlp6s0" ];
lanInterfaces = [ "enp1s0" "enp3s0" ];
internalRouterIP = "10.2.2.1";
dhcp = {
@ -36,7 +52,7 @@
wleInterface24Ghz = "wlp4s0";
wleInterface5Ghz = "wlp6s0";
ssid = "testnet";
passphrase = "testnet";
passphrase = "testnettestnet";
};
};

1
role/base/default.nix
View file

@ -30,6 +30,7 @@
parted
borgbackup
nixfmt
iw
];
services.fwupd.enable = true;

4
role/router-wireless-ap/default.nix
View file

@ -72,8 +72,6 @@ in {
wpaPassphrase = cfg.passphrase;
channel = 36;
extraConfig = ''
${optionalString wle24GhzEnabled
"except-interface=${cfg.wleInterface24Ghz}"}
max_num_sta=255
#Details for Connecting Clients via WPA2 TKIP
@ -144,8 +142,6 @@ in {
wpaPassphrase = cfg.passphrase;
channel = 6;
extraConfig = ''
${optionalString wle5GhzEnabled
"except-interface=${cfg.wleInterface5Ghz}"}
#macaddr_acl sets options for mac address filtering. 0 means "accept unless in deny list"
macaddr_acl=0