From d1463bf5661f899f515e71f2739ae067b2883f36 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Mon, 14 Nov 2022 22:33:29 +0000 Subject: [PATCH] ANDROID: GKI: Convert TIPC to gki modules Converts following networking features to modules: CONFIG_TIPC: The Transparent Inter Process Communication (TIPC) protocol. CONFIG_TIPC_DIAG: TIPC: socket monitoring interface Bug: 232431151 Test: TH Change-Id: I370cc7a34f67222b619107d773cc4a13edd6b538 Signed-off-by: Ramji Jiyani (cherry picked from commit e516a098e2a4605ce113dc85ba6ac4c93d5136fc) --- BUILD.bazel | 2 ++ android/gki_system_dlkm_modules | 2 ++ arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index a0ad8f3ada40..809c555d5051 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -34,6 +34,8 @@ _common_gki_modules_list = [ "net/can/can-gw.ko", "net/can/can-raw.ko", "net/mac80211/mac80211.ko", + "net/tipc/diag.ko", + "net/tipc/tipc.ko", "net/wireless/cfg80211.ko", ] diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index f9b39a9a998b..2a9ac5ca246c 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -10,5 +10,7 @@ net/can/can-bcm.ko net/can/can-gw.ko net/can/can-raw.ko net/mac80211/mac80211.ko +net/tipc/diag.ko +net/tipc/tipc.ko net/wireless/cfg80211.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4432cff24aa2..d491f00a1342 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -212,7 +212,7 @@ CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y -CONFIG_TIPC=y +CONFIG_TIPC=m CONFIG_L2TP=y CONFIG_BRIDGE=y CONFIG_VLAN_8021Q=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 663ab21c2e0f..8880f3456be7 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -202,7 +202,7 @@ CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y -CONFIG_TIPC=y +CONFIG_TIPC=m CONFIG_L2TP=y CONFIG_BRIDGE=y CONFIG_VLAN_8021Q=y