From abd0418684638b2df9e9e39fe45e6616c121ec9a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 19 Jan 2025 19:47:23 +0100 Subject: [PATCH] kernel: Activate CONFIG_NET_SWITCHDEV in generic config The CONFIG_NET_SWITCHDEV option is needed by CONFIG_DSA and some other options. It is boolean, we have to compile it into the kernel it self. Activate it for all targets in the generic configuration, it is already activated for most of them. This allows to install DSA drivers as a module. On the ramips/mt7620 target the kernel would grown by 4.5kB. For some small targets which do not support a DSA switch by default the option is deactivated. Link: https://github.com/openwrt/openwrt/pull/17668 Signed-off-by: Hauke Mehrtens --- package/kernel/linux/modules/netdevices.mk | 3 +-- target/linux/airoha/an7581/config-6.6 | 1 - target/linux/apm821xx/nand/config-default | 1 - target/linux/at91/sama7/config-6.6 | 1 - target/linux/ath79/mikrotik/config-default | 1 - target/linux/ath79/tiny/config-default | 1 - target/linux/bcm47xx/config-6.6 | 1 + target/linux/bcm4908/config-6.6 | 1 - target/linux/bcm53xx/config-6.6 | 1 - target/linux/bmips/bcm6318/config-6.6 | 1 - target/linux/bmips/bcm63268/config-6.6 | 1 - target/linux/bmips/bcm6328/config-6.6 | 1 - target/linux/bmips/bcm6358/config-6.6 | 1 - target/linux/bmips/bcm6362/config-6.6 | 1 - target/linux/bmips/bcm6368/config-6.6 | 1 - target/linux/gemini/config-6.6 | 1 - target/linux/generic/config-6.6 | 2 +- target/linux/imx/config-6.6 | 1 - target/linux/ipq40xx/config-6.6 | 1 - target/linux/ipq806x/config-6.6 | 1 - target/linux/ixp4xx/config-6.6 | 1 - target/linux/kirkwood/config-6.6 | 1 - target/linux/lantiq/ase/config-6.6 | 1 + target/linux/lantiq/falcon/config-6.6 | 1 + target/linux/lantiq/xrx200/config-6.6 | 1 - target/linux/lantiq/xrx200_legacy/config-6.6 | 1 - target/linux/lantiq/xway/config-6.6 | 1 + target/linux/lantiq/xway_legacy/config-6.6 | 1 + target/linux/layerscape/armv7/config-6.6 | 1 - target/linux/layerscape/armv8_64b/config-6.6 | 1 - target/linux/mediatek/filogic/config-6.6 | 1 - target/linux/mediatek/mt7622/config-6.6 | 1 - target/linux/mediatek/mt7623/config-6.6 | 1 - target/linux/mediatek/mt7629/config-6.6 | 1 - target/linux/mpc85xx/p1010/config-default | 1 - target/linux/mpc85xx/p1020/config-default | 1 - target/linux/mvebu/config-6.6 | 1 - target/linux/octeon/config-6.6 | 1 - target/linux/omap/config-6.6 | 1 - target/linux/qoriq/config-6.6 | 1 - target/linux/qualcommax/config-6.6 | 1 - target/linux/qualcommbe/config-6.6 | 1 - target/linux/ramips/mt7620/config-6.6 | 1 + target/linux/ramips/mt7621/config-6.6 | 1 - target/linux/ramips/mt76x8/config-6.6 | 1 + target/linux/ramips/rt288x/config-6.6 | 1 + target/linux/ramips/rt305x/config-6.6 | 1 + target/linux/ramips/rt3883/config-6.6 | 1 + target/linux/realtek/rtl838x/config-6.6 | 1 - target/linux/realtek/rtl839x/config-6.6 | 1 - target/linux/realtek/rtl930x/config-6.6 | 1 - target/linux/realtek/rtl931x/config-6.6 | 1 - target/linux/rockchip/armv8/config-6.6 | 1 - target/linux/siflower/sf19a2890/config-6.6 | 1 - target/linux/siflower/sf21/config-6.6 | 1 - target/linux/sunxi/cortexa7/config-6.6 | 1 - 56 files changed, 12 insertions(+), 47 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 541202c5e3..1239e34222 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1782,8 +1782,7 @@ define KernelPackage/mlxsw-spectrum FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko KCONFIG:= \ CONFIG_MLXSW_SPECTRUM \ - CONFIG_MLXSW_SPECTRUM_DCB=y \ - CONFIG_NET_SWITCHDEV=y + CONFIG_MLXSW_SPECTRUM_DCB=y AUTOLOAD:=$(call AutoProbe,mlxsw_spectrum) endef diff --git a/target/linux/airoha/an7581/config-6.6 b/target/linux/airoha/an7581/config-6.6 index af13a72d01..00e09ff83d 100644 --- a/target/linux/airoha/an7581/config-6.6 +++ b/target/linux/airoha/an7581/config-6.6 @@ -230,7 +230,6 @@ CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_MEDIATEK_SOC is not set CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y # CONFIG_NET_VENDOR_3COM is not set CONFIG_NET_VENDOR_MEDIATEK=y CONFIG_NLS=y diff --git a/target/linux/apm821xx/nand/config-default b/target/linux/apm821xx/nand/config-default index 6c425553b4..ac91a82882 100644 --- a/target/linux/apm821xx/nand/config-default +++ b/target/linux/apm821xx/nand/config-default @@ -21,7 +21,6 @@ CONFIG_NET_DSA=y CONFIG_NET_DSA_QCA8K=y CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y CONFIG_NET_DSA_TAG_QCA=y -CONFIG_NET_SWITCHDEV=y # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set CONFIG_PHYLINK=y CONFIG_QCA83XX_PHY=y diff --git a/target/linux/at91/sama7/config-6.6 b/target/linux/at91/sama7/config-6.6 index c69cbdf767..90847af7b8 100644 --- a/target/linux/at91/sama7/config-6.6 +++ b/target/linux/at91/sama7/config-6.6 @@ -275,7 +275,6 @@ CONFIG_NET_HANDSHAKE=y CONFIG_NET_INGRESS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NFS_FS=y CONFIG_NLS=y diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default index 2976c24470..735de06d55 100644 --- a/target/linux/ath79/mikrotik/config-default +++ b/target/linux/ath79/mikrotik/config-default @@ -33,7 +33,6 @@ CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_NET_DEVLINK=y CONFIG_NET_DSA=y -CONFIG_NET_SWITCHDEV=y # CONFIG_NVMEM_LAYOUT_MIKROTIK is not set CONFIG_PHYLINK=y CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/target/linux/ath79/tiny/config-default b/target/linux/ath79/tiny/config-default index 38fbe1b522..8aca93b54e 100644 --- a/target/linux/ath79/tiny/config-default +++ b/target/linux/ath79/tiny/config-default @@ -1,7 +1,6 @@ CONFIG_GRO_CELLS=y CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y CONFIG_NET_DEVLINK=y -CONFIG_NET_SWITCHDEV=y CONFIG_NVMEM_SYSFS=y CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_PHYLINK=y diff --git a/target/linux/bcm47xx/config-6.6 b/target/linux/bcm47xx/config-6.6 index ec549f6e33..0e48efd620 100644 --- a/target/linux/bcm47xx/config-6.6 +++ b/target/linux/bcm47xx/config-6.6 @@ -128,6 +128,7 @@ CONFIG_NEED_PER_CPU_KM=y CONFIG_NET_EGRESS=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/bcm4908/config-6.6 b/target/linux/bcm4908/config-6.6 index 02eb2f2ce6..f31e2de9ea 100644 --- a/target/linux/bcm4908/config-6.6 +++ b/target/linux/bcm4908/config-6.6 @@ -187,7 +187,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_IOPORT_MAP=y CONFIG_NR_CPUS=4 diff --git a/target/linux/bcm53xx/config-6.6 b/target/linux/bcm53xx/config-6.6 index 9e3211801c..a3030c116f 100644 --- a/target/linux/bcm53xx/config-6.6 +++ b/target/linux/bcm53xx/config-6.6 @@ -248,7 +248,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NR_CPUS=2 CONFIG_NVMEM=y diff --git a/target/linux/bmips/bcm6318/config-6.6 b/target/linux/bmips/bcm6318/config-6.6 index ae4516cdcc..e01970155d 100644 --- a/target/linux/bmips/bcm6318/config-6.6 +++ b/target/linux/bmips/bcm6318/config-6.6 @@ -178,7 +178,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/bmips/bcm63268/config-6.6 b/target/linux/bmips/bcm63268/config-6.6 index e71c70dce9..00609efc15 100644 --- a/target/linux/bmips/bcm63268/config-6.6 +++ b/target/linux/bmips/bcm63268/config-6.6 @@ -192,7 +192,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/bmips/bcm6328/config-6.6 b/target/linux/bmips/bcm6328/config-6.6 index c069c11d9b..d4323cb83c 100644 --- a/target/linux/bmips/bcm6328/config-6.6 +++ b/target/linux/bmips/bcm6328/config-6.6 @@ -190,7 +190,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/bmips/bcm6358/config-6.6 b/target/linux/bmips/bcm6358/config-6.6 index 0b3c0dd701..395f68c6c6 100644 --- a/target/linux/bmips/bcm6358/config-6.6 +++ b/target/linux/bmips/bcm6358/config-6.6 @@ -176,7 +176,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/bmips/bcm6362/config-6.6 b/target/linux/bmips/bcm6362/config-6.6 index 5e6a936ab1..5e7ee965cd 100644 --- a/target/linux/bmips/bcm6362/config-6.6 +++ b/target/linux/bmips/bcm6362/config-6.6 @@ -191,7 +191,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/bmips/bcm6368/config-6.6 b/target/linux/bmips/bcm6368/config-6.6 index e214d9a0f1..a80bb2457f 100644 --- a/target/linux/bmips/bcm6368/config-6.6 +++ b/target/linux/bmips/bcm6368/config-6.6 @@ -191,7 +191,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/gemini/config-6.6 b/target/linux/gemini/config-6.6 index c2e0cdd488..04bb2b70ca 100644 --- a/target/linux/gemini/config-6.6 +++ b/target/linux/gemini/config-6.6 @@ -291,7 +291,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_INGRESS=y CONFIG_NET_NS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NO_HZ_COMMON=y diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index 78f8b1e5cc..5051a8aba2 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -4077,7 +4077,7 @@ CONFIG_NET_SCH_FQ_CODEL=y # CONFIG_NET_SCH_TEQL is not set # CONFIG_NET_SELFTESTS is not set CONFIG_NET_SOCK_MSG=y -# CONFIG_NET_SWITCHDEV is not set +CONFIG_NET_SWITCHDEV=y # CONFIG_NET_TC_SKB_EXT is not set # CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set diff --git a/target/linux/imx/config-6.6 b/target/linux/imx/config-6.6 index fb841686ff..33478f29b9 100644 --- a/target/linux/imx/config-6.6 +++ b/target/linux/imx/config-6.6 @@ -314,7 +314,6 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NR_CPUS=4 diff --git a/target/linux/ipq40xx/config-6.6 b/target/linux/ipq40xx/config-6.6 index d1c181cd0d..4e3b53adc8 100644 --- a/target/linux/ipq40xx/config-6.6 +++ b/target/linux/ipq40xx/config-6.6 @@ -313,7 +313,6 @@ CONFIG_NET_DSA_TAG_OOB=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NO_HZ=y CONFIG_NO_HZ_COMMON=y diff --git a/target/linux/ipq806x/config-6.6 b/target/linux/ipq806x/config-6.6 index a71b02fe69..53eeb748a0 100644 --- a/target/linux/ipq806x/config-6.6 +++ b/target/linux/ipq806x/config-6.6 @@ -306,7 +306,6 @@ CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NO_HZ=y CONFIG_NO_HZ_COMMON=y diff --git a/target/linux/ixp4xx/config-6.6 b/target/linux/ixp4xx/config-6.6 index c0211c940b..1b39b14c5e 100644 --- a/target/linux/ixp4xx/config-6.6 +++ b/target/linux/ixp4xx/config-6.6 @@ -172,7 +172,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_INGRESS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_XSCALE=y CONFIG_NET_XGRESS=y CONFIG_NLS=y diff --git a/target/linux/kirkwood/config-6.6 b/target/linux/kirkwood/config-6.6 index e334152380..79306bee75 100644 --- a/target/linux/kirkwood/config-6.6 +++ b/target/linux/kirkwood/config-6.6 @@ -195,7 +195,6 @@ CONFIG_NET_DSA=y CONFIG_NET_EGRESS=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NVMEM=y diff --git a/target/linux/lantiq/ase/config-6.6 b/target/linux/lantiq/ase/config-6.6 index f47a91c380..7a5dfada6e 100644 --- a/target/linux/lantiq/ase/config-6.6 +++ b/target/linux/lantiq/ase/config-6.6 @@ -11,6 +11,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_HW_RANDOM=y # CONFIG_ISDN is not set CONFIG_LANTIQ_ETOP=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NLS=y CONFIG_SGL_ALLOC=y CONFIG_SOC_AMAZON_SE=y diff --git a/target/linux/lantiq/falcon/config-6.6 b/target/linux/lantiq/falcon/config-6.6 index d5c5c61505..b176d6e767 100644 --- a/target/linux/lantiq/falcon/config-6.6 +++ b/target/linux/lantiq/falcon/config-6.6 @@ -3,6 +3,7 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_SPLIT_FIRMWARE_NAME="linux" +# CONFIG_NET_SWITCHDEV is not set CONFIG_PINCTRL_FALCON=y CONFIG_SOC_FALCON=y # CONFIG_SOC_XWAY is not set diff --git a/target/linux/lantiq/xrx200/config-6.6 b/target/linux/lantiq/xrx200/config-6.6 index f4362a4b2c..e8a85745e7 100644 --- a/target/linux/lantiq/xrx200/config-6.6 +++ b/target/linux/lantiq/xrx200/config-6.6 @@ -49,7 +49,6 @@ CONFIG_NEED_SRCU_NMI_SAFE=y CONFIG_NET_DEVLINK=y CONFIG_NET_DSA=y CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y diff --git a/target/linux/lantiq/xrx200_legacy/config-6.6 b/target/linux/lantiq/xrx200_legacy/config-6.6 index 9677a606e3..4f85037da1 100644 --- a/target/linux/lantiq/xrx200_legacy/config-6.6 +++ b/target/linux/lantiq/xrx200_legacy/config-6.6 @@ -36,7 +36,6 @@ CONFIG_NEED_SRCU_NMI_SAFE=y CONFIG_NET_DEVLINK=y CONFIG_NET_DSA=y CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y diff --git a/target/linux/lantiq/xway/config-6.6 b/target/linux/lantiq/xway/config-6.6 index a51e0f9c2d..955abbe539 100644 --- a/target/linux/lantiq/xway/config-6.6 +++ b/target/linux/lantiq/xway/config-6.6 @@ -39,6 +39,7 @@ CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_NEED_SRCU_NMI_SAFE=y CONFIG_NET_FLOW_LIMIT=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NLS=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y diff --git a/target/linux/lantiq/xway_legacy/config-6.6 b/target/linux/lantiq/xway_legacy/config-6.6 index ed3ecd8b4d..ffa5948c8e 100644 --- a/target/linux/lantiq/xway_legacy/config-6.6 +++ b/target/linux/lantiq/xway_legacy/config-6.6 @@ -13,6 +13,7 @@ CONFIG_LANTIQ_ETOP=y # CONFIG_LEDS_TRIGGER_TIMER is not set CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NLS=y CONFIG_PCI=y # CONFIG_PCIE_LANTIQ is not set diff --git a/target/linux/layerscape/armv7/config-6.6 b/target/linux/layerscape/armv7/config-6.6 index be8eca1bf7..a9447291ce 100644 --- a/target/linux/layerscape/armv7/config-6.6 +++ b/target/linux/layerscape/armv7/config-6.6 @@ -417,7 +417,6 @@ CONFIG_NET_INGRESS=y CONFIG_NET_NS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y diff --git a/target/linux/layerscape/armv8_64b/config-6.6 b/target/linux/layerscape/armv8_64b/config-6.6 index 55b9d9b934..c2d22a9a49 100644 --- a/target/linux/layerscape/armv8_64b/config-6.6 +++ b/target/linux/layerscape/armv8_64b/config-6.6 @@ -563,7 +563,6 @@ CONFIG_NET_INGRESS=y CONFIG_NET_NS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y diff --git a/target/linux/mediatek/filogic/config-6.6 b/target/linux/mediatek/filogic/config-6.6 index 47964c2974..3ded7dd2ff 100644 --- a/target/linux/mediatek/filogic/config-6.6 +++ b/target/linux/mediatek/filogic/config-6.6 @@ -305,7 +305,6 @@ CONFIG_NET_INGRESS=y CONFIG_NET_MEDIATEK_SOC=y CONFIG_NET_MEDIATEK_SOC_WED=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y CONFIG_NET_XGRESS=y CONFIG_NLS=y diff --git a/target/linux/mediatek/mt7622/config-6.6 b/target/linux/mediatek/mt7622/config-6.6 index bdfb06af76..9b9ae63427 100644 --- a/target/linux/mediatek/mt7622/config-6.6 +++ b/target/linux/mediatek/mt7622/config-6.6 @@ -306,7 +306,6 @@ CONFIG_NET_INGRESS=y CONFIG_NET_MEDIATEK_SOC=y CONFIG_NET_MEDIATEK_SOC_WED=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y CONFIG_NET_XGRESS=y CONFIG_NLS=y diff --git a/target/linux/mediatek/mt7623/config-6.6 b/target/linux/mediatek/mt7623/config-6.6 index 8fd0f3a599..94372767a6 100644 --- a/target/linux/mediatek/mt7623/config-6.6 +++ b/target/linux/mediatek/mt7623/config-6.6 @@ -412,7 +412,6 @@ CONFIG_NET_INGRESS=y CONFIG_NET_MEDIATEK_SOC=y CONFIG_NET_MEDIATEK_SOC_WED=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_NET_XGRESS=y diff --git a/target/linux/mediatek/mt7629/config-6.6 b/target/linux/mediatek/mt7629/config-6.6 index 661f31ced6..008e57a20c 100644 --- a/target/linux/mediatek/mt7629/config-6.6 +++ b/target/linux/mediatek/mt7629/config-6.6 @@ -229,7 +229,6 @@ CONFIG_NET_INGRESS=y CONFIG_NET_MEDIATEK_SOC=y CONFIG_NET_MEDIATEK_SOC_WED=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y CONFIG_NET_XGRESS=y CONFIG_NLS=y diff --git a/target/linux/mpc85xx/p1010/config-default b/target/linux/mpc85xx/p1010/config-default index 22801b9c2b..639f28658b 100644 --- a/target/linux/mpc85xx/p1010/config-default +++ b/target/linux/mpc85xx/p1010/config-default @@ -28,7 +28,6 @@ CONFIG_NET_DSA=y CONFIG_NET_DSA_QCA8K=y CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y CONFIG_NET_DSA_TAG_QCA=y -CONFIG_NET_SWITCHDEV=y CONFIG_PHYLINK=y CONFIG_QCA83XX_PHY=y CONFIG_QCOM_NET_PHYLIB=y diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default index 6169791007..cf5af1599a 100644 --- a/target/linux/mpc85xx/p1020/config-default +++ b/target/linux/mpc85xx/p1020/config-default @@ -49,7 +49,6 @@ CONFIG_NET_DSA_TAG_BRCM_LEGACY=y CONFIG_NET_DSA_TAG_BRCM_PREPEND=y CONFIG_NET_DSA_TAG_NONE=y CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_SWITCHDEV=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y CONFIG_PANDA=y diff --git a/target/linux/mvebu/config-6.6 b/target/linux/mvebu/config-6.6 index 2881dd5ca2..939514e13f 100644 --- a/target/linux/mvebu/config-6.6 +++ b/target/linux/mvebu/config-6.6 @@ -290,7 +290,6 @@ CONFIG_NEON=y CONFIG_NET_DEVLINK=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NOP_USB_XCEIV=y CONFIG_NR_CPUS=4 diff --git a/target/linux/octeon/config-6.6 b/target/linux/octeon/config-6.6 index 5cae2a8821..d0821b755c 100644 --- a/target/linux/octeon/config-6.6 +++ b/target/linux/octeon/config-6.6 @@ -168,7 +168,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y diff --git a/target/linux/omap/config-6.6 b/target/linux/omap/config-6.6 index 5f19df0d8b..7a99a9c297 100644 --- a/target/linux/omap/config-6.6 +++ b/target/linux/omap/config-6.6 @@ -410,7 +410,6 @@ CONFIG_NET_KEY=y CONFIG_NET_KEY_MIGRATE=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_FS=y diff --git a/target/linux/qoriq/config-6.6 b/target/linux/qoriq/config-6.6 index 225b80df54..f82a62ee0f 100644 --- a/target/linux/qoriq/config-6.6 +++ b/target/linux/qoriq/config-6.6 @@ -262,7 +262,6 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NONSTATIC_KERNEL=y diff --git a/target/linux/qualcommax/config-6.6 b/target/linux/qualcommax/config-6.6 index 1467bc968b..fe63811934 100644 --- a/target/linux/qualcommax/config-6.6 +++ b/target/linux/qualcommax/config-6.6 @@ -269,7 +269,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NO_HZ_COMMON=y diff --git a/target/linux/qualcommbe/config-6.6 b/target/linux/qualcommbe/config-6.6 index ac5059682a..1c6ebf1c95 100644 --- a/target/linux/qualcommbe/config-6.6 +++ b/target/linux/qualcommbe/config-6.6 @@ -268,7 +268,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NO_HZ_COMMON=y diff --git a/target/linux/ramips/mt7620/config-6.6 b/target/linux/ramips/mt7620/config-6.6 index 3e1ef761e0..73651972c7 100644 --- a/target/linux/ramips/mt7620/config-6.6 +++ b/target/linux/ramips/mt7620/config-6.6 @@ -144,6 +144,7 @@ CONFIG_NET_RALINK_MT7620=y # CONFIG_NET_RALINK_RT3050 is not set CONFIG_NET_RALINK_SOC=y CONFIG_NET_SELFTESTS=y +# CONFIG_NET_SWITCHDEV is not set # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NET_XGRESS=y diff --git a/target/linux/ramips/mt7621/config-6.6 b/target/linux/ramips/mt7621/config-6.6 index 7a3e68ef45..10bb13bcfb 100644 --- a/target/linux/ramips/mt7621/config-6.6 +++ b/target/linux/ramips/mt7621/config-6.6 @@ -189,7 +189,6 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_MEDIATEK_SOC=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y # CONFIG_NET_VENDOR_RALINK is not set CONFIG_NET_XGRESS=y diff --git a/target/linux/ramips/mt76x8/config-6.6 b/target/linux/ramips/mt76x8/config-6.6 index f40d18efcc..c23874f37a 100644 --- a/target/linux/ramips/mt76x8/config-6.6 +++ b/target/linux/ramips/mt76x8/config-6.6 @@ -135,6 +135,7 @@ CONFIG_NET_RALINK_ESW_RT3050=y CONFIG_NET_RALINK_RT3050=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_SELFTESTS=y +# CONFIG_NET_SWITCHDEV is not set # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NET_XGRESS=y diff --git a/target/linux/ramips/rt288x/config-6.6 b/target/linux/ramips/rt288x/config-6.6 index 0c9798b9f3..a2b68c63ac 100644 --- a/target/linux/ramips/rt288x/config-6.6 +++ b/target/linux/ramips/rt288x/config-6.6 @@ -127,6 +127,7 @@ CONFIG_NET_RALINK_MDIO_RT2880=y CONFIG_NET_RALINK_RT2880=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_SELFTESTS=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NET_XGRESS=y CONFIG_NLS=m diff --git a/target/linux/ramips/rt305x/config-6.6 b/target/linux/ramips/rt305x/config-6.6 index 33efcba633..4b1439af14 100644 --- a/target/linux/ramips/rt305x/config-6.6 +++ b/target/linux/ramips/rt305x/config-6.6 @@ -127,6 +127,7 @@ CONFIG_NET_RALINK_ESW_RT3050=y CONFIG_NET_RALINK_RT3050=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_SELFTESTS=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NET_XGRESS=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/ramips/rt3883/config-6.6 b/target/linux/ramips/rt3883/config-6.6 index 4b768bfb77..5d003630e8 100644 --- a/target/linux/ramips/rt3883/config-6.6 +++ b/target/linux/ramips/rt3883/config-6.6 @@ -126,6 +126,7 @@ CONFIG_NET_RALINK_MDIO_RT2880=y CONFIG_NET_RALINK_RT3883=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_SELFTESTS=y +# CONFIG_NET_SWITCHDEV is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NET_XGRESS=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/realtek/rtl838x/config-6.6 b/target/linux/realtek/rtl838x/config-6.6 index b193377dda..9ac001b0d2 100644 --- a/target/linux/realtek/rtl838x/config-6.6 +++ b/target/linux/realtek/rtl838x/config-6.6 @@ -173,7 +173,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_INGRESS=y CONFIG_NET_RTL838X=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/realtek/rtl839x/config-6.6 b/target/linux/realtek/rtl839x/config-6.6 index 9b9bcae6df..594514914d 100644 --- a/target/linux/realtek/rtl839x/config-6.6 +++ b/target/linux/realtek/rtl839x/config-6.6 @@ -177,7 +177,6 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_RTL838X=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/realtek/rtl930x/config-6.6 b/target/linux/realtek/rtl930x/config-6.6 index a79ad61c24..497ca59ff5 100644 --- a/target/linux/realtek/rtl930x/config-6.6 +++ b/target/linux/realtek/rtl930x/config-6.6 @@ -152,7 +152,6 @@ CONFIG_NET_EGRESS=y CONFIG_NET_INGRESS=y CONFIG_NET_RTL838X=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/realtek/rtl931x/config-6.6 b/target/linux/realtek/rtl931x/config-6.6 index c9cd3ddfb4..02f7f0738c 100644 --- a/target/linux/realtek/rtl931x/config-6.6 +++ b/target/linux/realtek/rtl931x/config-6.6 @@ -169,7 +169,6 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_RTL838X=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y diff --git a/target/linux/rockchip/armv8/config-6.6 b/target/linux/rockchip/armv8/config-6.6 index 68eed3e5f9..c50372016e 100644 --- a/target/linux/rockchip/armv8/config-6.6 +++ b/target/linux/rockchip/armv8/config-6.6 @@ -435,7 +435,6 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NLS_ISO8859_1=y diff --git a/target/linux/siflower/sf19a2890/config-6.6 b/target/linux/siflower/sf19a2890/config-6.6 index c0fad35b7a..c7800ef24a 100644 --- a/target/linux/siflower/sf19a2890/config-6.6 +++ b/target/linux/siflower/sf19a2890/config-6.6 @@ -162,7 +162,6 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NO_EXCEPT_FILL=y diff --git a/target/linux/siflower/sf21/config-6.6 b/target/linux/siflower/sf21/config-6.6 index b66f377e3c..fbccbb9a5b 100644 --- a/target/linux/siflower/sf21/config-6.6 +++ b/target/linux/siflower/sf21/config-6.6 @@ -155,7 +155,6 @@ CONFIG_NET_SIFLOWER_ETH_DPNS=y CONFIG_NET_SIFLOWER_ETH_USE_INTERNAL_SRAM=y CONFIG_NET_SIFLOWER_ETH_XGMAC=y CONFIG_NET_SIFLOWER_ETH_XPCS=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_SIFLOWER=y CONFIG_NET_XGRESS=y CONFIG_NONPORTABLE=y diff --git a/target/linux/sunxi/cortexa7/config-6.6 b/target/linux/sunxi/cortexa7/config-6.6 index 105c090890..c1e2882f35 100644 --- a/target/linux/sunxi/cortexa7/config-6.6 +++ b/target/linux/sunxi/cortexa7/config-6.6 @@ -17,7 +17,6 @@ CONFIG_NET_DSA_TAG_BRCM=y CONFIG_NET_DSA_TAG_BRCM_COMMON=y CONFIG_NET_DSA_TAG_BRCM_LEGACY=y CONFIG_NET_DSA_TAG_BRCM_PREPEND=y -CONFIG_NET_SWITCHDEV=y CONFIG_NOP_USB_XCEIV=y CONFIG_RTC_DRV_SUN6I=y CONFIG_SUN20I_D1_CCU=y