From ba40eac9e58daa37af543055c40153da372c4b85 Mon Sep 17 00:00:00 2001 From: Victor Shutemov Date: Fri, 10 Dec 2021 18:00:13 +0100 Subject: [PATCH] ANDROID: GKI: Add VLAN_8021Q VLAN_8021Q is needed for haleytek vehicle projects. It's not possible to add as a vendor module since building as module changes built-in data structures. Bug: 210119134 Signed-off-by: Victor Shutemov Change-Id: I2098a3bc2fe25bfb3cc69cac947ab4b94c1f5e7f --- android/abi_gki_aarch64_virtual_device | 5 +++++ arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 3 files changed, 7 insertions(+) diff --git a/android/abi_gki_aarch64_virtual_device b/android/abi_gki_aarch64_virtual_device index 5607beb5d87b..fa9865f9da12 100644 --- a/android/abi_gki_aarch64_virtual_device +++ b/android/abi_gki_aarch64_virtual_device @@ -501,6 +501,11 @@ # required by failover.ko netdev_master_upper_dev_link rtnl_is_locked + vlan_uses_dev + vlan_vid_add + vlan_vid_del + vlan_vids_add_by_dev + vlan_vids_del_by_dev # required by gnss-cmdline.ko bus_find_device diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index dffaa14de551..42e60d1b623d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -227,6 +227,7 @@ CONFIG_IP6_NF_RAW=y CONFIG_TIPC=y CONFIG_L2TP=y CONFIG_BRIDGE=y +CONFIG_VLAN_8021Q=y 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 f713bebb5dca..7c7a02e310e4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -203,6 +203,7 @@ CONFIG_IP6_NF_RAW=y CONFIG_TIPC=y CONFIG_L2TP=y CONFIG_BRIDGE=y +CONFIG_VLAN_8021Q=y CONFIG_6LOWPAN=y CONFIG_IEEE802154=y CONFIG_IEEE802154_6LOWPAN=y