commit 0a46ba7fc3dd1a727562da0c2884cfad7d746429 parent f1b77805373c31c2db5a4faa1052136a5e3de94a Author: Daniel Barlow <dan@telent.net> Date: Wed, 19 Oct 2022 17:36:31 +0100 move some wifi-related comments into wlan module Diffstat:
| M | devices/gl-ar750/default.nix | | | 16 | ---------------- |
| M | modules/wlan.nix | | | 22 | ++++++++++++++++++++-- |
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix @@ -119,22 +119,6 @@ "PRINTK_TIME" = "y"; "SQUASHFS" = "y"; "SQUASHFS_XZ" = "y"; - # "ASN1" = "y"; - # "ASYMMETRIC_KEY_TYPE" = "y"; - # "ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "y"; - # "CRC_CCITT" = "y"; - # "CRYPTO" = "y"; - # "CRYPTO_ARC4" = "y"; - # "CRYPTO_CBC" = "y"; - # "CRYPTO_CCM" = "y"; - # "CRYPTO_CMAC" = "y"; - # "CRYPTO_GCM" = "y"; - # "CRYPTO_HASH_INFO" = "y"; - # "CRYPTO_LIB_ARC4" = "y"; - # "CRYPTO_RSA" = "y"; - # "CRYPTO_SHA1" = "y"; - # "ENCRYPTED_KEYS" = "y"; - # "KEYS" = "y"; }; }; outputs.default = "directory"; diff --git a/modules/wlan.nix b/modules/wlan.nix @@ -7,14 +7,32 @@ let in { config = { kernel = rec { - config = { + checkedConfig = { CFG80211= "y"; MAC80211= "y"; MAC80211_MESH= "y"; RFKILL= "y"; WLAN = "y"; + # if/when we switch to using backported mac80211 drivers built + # as modules, based on nixwrt code we expect we will need this config + # to enable them + # "ASN1" = "y"; + # "ASYMMETRIC_KEY_TYPE" = "y"; + # "ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "y"; + # "CRC_CCITT" = "y"; + # "CRYPTO" = "y"; + # "CRYPTO_ARC4" = "y"; + # "CRYPTO_CBC" = "y"; + # "CRYPTO_CCM" = "y"; + # "CRYPTO_CMAC" = "y"; + # "CRYPTO_GCM" = "y"; + # "CRYPTO_HASH_INFO" = "y"; + # "CRYPTO_LIB_ARC4" = "y"; + # "CRYPTO_RSA" = "y"; + # "CRYPTO_SHA1" = "y"; + # "ENCRYPTED_KEYS" = "y"; + # "KEYS" = "y"; }; - checkedConfig = config; }; }; }