From dd503c2c080fc503e58e589ffdfce9075dfa25b3 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Mon, 14 Nov 2022 23:15:13 +0000 Subject: [PATCH] ANDROID: GKI: Convert VLAN 8021Q as gki module Sets following feature to module: CONFIG_VLAN_8021Q: Create 8021Q vlan interfaces. Bug: 232431151 Test: TH Change-Id: I4728f03b04bb49f65838564c96f88d232cbf21e8 Signed-off-by: Ramji Jiyani (cherry picked from commit 2cf15a5bbc4a8d7e8f33a31e1647ce1095150aaa) --- BUILD.bazel | 1 + android/gki_system_dlkm_modules | 1 + arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 809c555d5051..932001e19545 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -30,6 +30,7 @@ _common_gki_modules_list = [ "drivers/usb/serial/ftdi_sio.ko", "drivers/usb/serial/usbserial.ko", "mm/zsmalloc.ko", + "net/8021q/8021q.ko", "net/can/can-bcm.ko", "net/can/can-gw.ko", "net/can/can-raw.ko", diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index 2a9ac5ca246c..f6518233d9ff 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -6,6 +6,7 @@ drivers/usb/class/cdc-acm.ko drivers/usb/serial/ftdi_sio.ko drivers/usb/serial/usbserial.ko mm/zsmalloc.ko +net/8021q/8021q.ko net/can/can-bcm.ko net/can/can-gw.ko net/can/can-raw.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index d491f00a1342..f74d71ee0f22 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -215,7 +215,7 @@ CONFIG_IP6_NF_RAW=y CONFIG_TIPC=m CONFIG_L2TP=y CONFIG_BRIDGE=y -CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q=m CONFIG_6LOWPAN=y CONFIG_IEEE802154=y CONFIG_IEEE802154_6LOWPAN=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 8880f3456be7..481110e55540 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -205,7 +205,7 @@ CONFIG_IP6_NF_RAW=y CONFIG_TIPC=m CONFIG_L2TP=y CONFIG_BRIDGE=y -CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q=m CONFIG_6LOWPAN=y CONFIG_IEEE802154=y CONFIG_IEEE802154_6LOWPAN=y