From de77635490f7513748be723f3f1239dc6c18b9b5 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Wed, 30 Aug 2023 17:29:42 +0100 Subject: [PATCH] move bridge-related kernel config to the module --- devices/gl-mt300a/default.nix | 4 ---- devices/gl-mt300n-v2/default.nix | 4 ---- modules/bridge/default.nix | 6 +++++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix index ac57d6e3..5b879e10 100644 --- a/devices/gl-mt300a/default.nix +++ b/devices/gl-mt300a/default.nix @@ -131,10 +131,6 @@ SWCONFIG = "y"; SWPHY = "y"; - BRIDGE = "y"; - BRIDGE_VLAN_FILTERING = "y"; - BRIDGE_IGMP_SNOOPING = "y"; - MTD = "y"; MTD_CMDLINE_PARTS = "y"; MTD_BLOCK = "y"; # fix undefined ref to register_mtd_blktrans_devs diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix index 0f0f47c6..3e1986ab 100644 --- a/devices/gl-mt300n-v2/default.nix +++ b/devices/gl-mt300n-v2/default.nix @@ -157,10 +157,6 @@ SWCONFIG = "y"; SWPHY = "y"; - BRIDGE = "y"; - BRIDGE_VLAN_FILTERING = "y"; - BRIDGE_IGMP_SNOOPING = "y"; - WATCHDOG = "y"; RALINK_WDT = "y"; # watchdog MT7621_WDT = "y"; # or it might be this one diff --git a/modules/bridge/default.nix b/modules/bridge/default.nix index 1145ec7b..dc1d071a 100644 --- a/modules/bridge/default.nix +++ b/modules/bridge/default.nix @@ -39,5 +39,9 @@ in }; }; }; - config.kernel.config.BRIDGE = "y"; + config.kernel.config = { + BRIDGE = "y"; + BRIDGE_VLAN_FILTERING = "y"; + BRIDGE_IGMP_SNOOPING = "y"; + }; }