summary refs log tree commit diff
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@riseup.net>2018-05-15 15:48:36 +0300
committerGitHub <noreply@github.com>2018-05-15 15:48:36 +0300
commit97071e5e151285d69c9ef9c1accd3921e54663b4 (patch)
tree21514aa6f45528452e00dbfd9b72887051ded0a5
parent1092a243075472f875a399b162847cfcdf652a2e (diff)
parentc7e8ddc066ea4d06b979c066fa983f3d1c00d232 (diff)
downloadnixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.tar
nixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.tar.gz
nixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.tar.bz2
nixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.tar.lz
nixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.tar.xz
nixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.tar.zst
nixlib-97071e5e151285d69c9ef9c1accd3921e54663b4.zip
Merge pull request #40546 from yorickvP/patch-2
linux: add CONFIG_KEY_DH_OPERATIONS
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4af5889fd1cd..ec2b2f387950 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -636,6 +636,11 @@ with stdenv.lib;
     X86_X2APIC y
     IRQ_REMAP y
   ''}
+  
+  # needed for iwd WPS support (wpa_supplicant replacement)
+  ${optionalString (versionAtLeast version "4.7") ''
+    KEY_DH_OPERATIONS y
+  ''}
 
   # Disable the firmware helper fallback, udev doesn't implement it any more
   FW_LOADER_USER_HELPER_FALLBACK? n