diff --git a/modules/common/hardware/ax88179_178a.nix b/modules/common/hardware/ax88179_178a.nix deleted file mode 100644 index 3e0f686b54..0000000000 --- a/modules/common/hardware/ax88179_178a.nix +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2024 TII (SSRC) and the Ghaf contributors -# SPDX-License-Identifier: Apache-2.0 -# -# Fix for ax88179_178a USB network card kernel driver MAC-address issue. -{ - lib, - pkgs, - config, - ... -}: let - cfg = config.ghaf.hardware.ax88179_178a; -in { - options.ghaf.hardware.ax88179_178a = { - enable = lib.mkEnableOption "fix for ax88179_178a USB network card kernel driver MAC-address"; - }; - - config = lib.mkIf cfg.enable { - boot.kernelPatches = [ - # Fix MAC-address randomized on USB network cards because of kernel bug. - # This specifically affects network cards used in testing. - { - patch = pkgs.fetchpatch2 { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=2e91bb99b9d4f756e92e83c4453f894dda220f09"; - hash = "sha256-fX7yBsXW1oFt1Nfns42oZnCXf36qehXijvCNEmqBGsE="; - }; - } - ]; - }; -} diff --git a/modules/common/hardware/default.nix b/modules/common/hardware/default.nix index c19ca9dd80..051f1cec02 100644 --- a/modules/common/hardware/default.nix +++ b/modules/common/hardware/default.nix @@ -5,7 +5,5 @@ ./x86_64-linux.nix ./x86_64-generic ./definition.nix - - ./ax88179_178a.nix ]; } diff --git a/targets/generic-x86_64/flake-module.nix b/targets/generic-x86_64/flake-module.nix index 71cc549ff6..87067d9d22 100644 --- a/targets/generic-x86_64/flake-module.nix +++ b/targets/generic-x86_64/flake-module.nix @@ -45,7 +45,6 @@ { ghaf = { hardware.x86_64.common.enable = true; - hardware.ax88179_178a.enable = true; virtualization.microvm-host.enable = true; virtualization.microvm-host.networkSupport = true; diff --git a/targets/lenovo-x1-installer/flake-module.nix b/targets/lenovo-x1-installer/flake-module.nix index 2fb2646360..abd7206925 100644 --- a/targets/lenovo-x1-installer/flake-module.nix +++ b/targets/lenovo-x1-installer/flake-module.nix @@ -25,11 +25,8 @@ in { imports = [ "${toString modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" - ../../modules/common/hardware/ax88179_178a.nix ]; - ghaf.hardware.ax88179_178a.enable = true; - # SSH key to installer for test automation. users.users.nixos.openssh.authorizedKeys.keys = lib.mkIf (variant == "debug") [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAolaKCuIUBQSBFGFZI1taNX+JTAr8edqUts7A6k2Kv7" diff --git a/targets/lenovo-x1/everything.nix b/targets/lenovo-x1/everything.nix index fb24b326eb..7ac6890e4f 100644 --- a/targets/lenovo-x1/everything.nix +++ b/targets/lenovo-x1/everything.nix @@ -78,7 +78,6 @@ host.kernel.hardening.hypervisor.enable = false; hardware.x86_64.common.enable = true; - hardware.ax88179_178a.enable = true; security.tpm2.enable = true;