From 7070a0ef92d64a9f7ccd51f6688bd9935c3a543e Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Thu, 17 Nov 2022 01:12:56 +0000 Subject: [PATCH] ANDROID: GKI: Convert L2TP as modules Converts L2TP and PPP over L2TP as GKI modules. CONFIG_L2TP: Layer Two Tunneling Protocol (L2TP) CONFIG_PPOL2TP: PPP over L2TP Makes CONFIG_NETFILTER_XT_MATCH_L2TP visible in the savedefconfig. Bug: 232431151 Test: TH Change-Id: I0e1cbd8f04f97f172f8b1551eade21cf303b24ed Signed-off-by: Ramji Jiyani --- android/gki_aarch64_modules | 2 ++ android/gki_system_dlkm_modules | 2 ++ arch/arm64/configs/gki_defconfig | 5 +++-- arch/x86/configs/gki_defconfig | 5 +++-- modules.bzl | 2 ++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules index 6c0c491ae76c..17e0e5bdb36f 100644 --- a/android/gki_aarch64_modules +++ b/android/gki_aarch64_modules @@ -19,6 +19,8 @@ net/can/can-gw.ko net/bluetooth/bluetooth.ko net/bluetooth/rfcomm/rfcomm.ko net/bluetooth/hidp/hidp.ko +net/l2tp/l2tp_core.ko +net/l2tp/l2tp_ppp.ko net/mac80211/mac80211.ko net/tipc/tipc.ko net/tipc/diag.ko diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index 9f220eca2809..8d7184069ee8 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -29,6 +29,8 @@ net/can/can-raw.ko net/ieee802154/6lowpan/ieee802154_6lowpan.ko net/ieee802154/ieee802154.ko net/ieee802154/ieee802154_socket.ko +net/l2tp/l2tp_core.ko +net/l2tp/l2tp_ppp.ko net/mac80211/mac80211.ko net/mac802154/mac802154.ko net/nfc/nfc.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 05a62c33b7f3..8704833e23fd 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -192,6 +192,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=y CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y CONFIG_NETFILTER_XT_MATCH_HELPER=y CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +CONFIG_NETFILTER_XT_MATCH_L2TP=y CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y @@ -231,7 +232,7 @@ CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_TIPC=m -CONFIG_L2TP=y +CONFIG_L2TP=m CONFIG_BRIDGE=y CONFIG_VLAN_8021Q=m CONFIG_6LOWPAN=m @@ -337,7 +338,7 @@ CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y CONFIG_PPTP=y -CONFIG_PPPOL2TP=y +CONFIG_PPPOL2TP=m CONFIG_USB_RTL8150=y CONFIG_USB_RTL8152=y CONFIG_USB_USBNET=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b497b58c9626..d541a0e7c3de 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -173,6 +173,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=y CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y CONFIG_NETFILTER_XT_MATCH_HELPER=y CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +CONFIG_NETFILTER_XT_MATCH_L2TP=y CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y @@ -212,7 +213,7 @@ CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_TIPC=m -CONFIG_L2TP=y +CONFIG_L2TP=m CONFIG_BRIDGE=y CONFIG_VLAN_8021Q=m CONFIG_6LOWPAN=m @@ -310,7 +311,7 @@ CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y CONFIG_PPTP=y -CONFIG_PPPOL2TP=y +CONFIG_PPPOL2TP=m CONFIG_USB_RTL8150=y CONFIG_USB_RTL8152=y CONFIG_USB_USBNET=y diff --git a/modules.bzl b/modules.bzl index bee7fc6d7161..f6c68a11f563 100644 --- a/modules.bzl +++ b/modules.bzl @@ -31,6 +31,8 @@ COMMON_GKI_MODULES_LIST = [ "net/ieee802154/6lowpan/ieee802154_6lowpan.ko", "net/ieee802154/ieee802154.ko", "net/ieee802154/ieee802154_socket.ko", + "net/l2tp/l2tp_core.ko", + "net/l2tp/l2tp_ppp.ko", "net/mac80211/mac80211.ko", "net/mac802154/mac802154.ko", "net/nfc/nfc.ko",