From 0a53ec9384a0fe552dea17c706812ebde4d78567 Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Wed, 16 Nov 2022 19:39:38 +0000
Subject: [PATCH] ANDROID: GKI: Convert 6LoWPAN Support as module

Converts IPv6 6LoWPAN as GKI modules.

CONFIG_6LOWPAN: 6LoWPAN Support
IPv6 over Low power Wireless Personal Area Network -
"6LoWPAN" which is supported by IEEE 802.15.4 or Bluetooth stacks.

CONFIG_IEEE802154_6LOWPAN: 6lowpan support over IEEE 802.15.4

Bug: 232431151
Test: TH
Change-Id: I4257cedfd499e1e01faba966e17c3d9dbf4dcbb7
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
---
 android/gki_system_dlkm_modules  | 9 +++++++++
 arch/arm64/configs/gki_defconfig | 4 ++--
 arch/x86/configs/gki_defconfig   | 4 ++--
 modules.bzl                      | 9 +++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 2a3cd4a42882..6386038d05ac 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -10,6 +10,14 @@ drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko
 mm/zsmalloc.ko
+net/6lowpan/6lowpan.ko
+net/6lowpan/nhc_dest.ko
+net/6lowpan/nhc_fragment.ko
+net/6lowpan/nhc_hop.ko
+net/6lowpan/nhc_ipv6.ko
+net/6lowpan/nhc_mobility.ko
+net/6lowpan/nhc_routing.ko
+net/6lowpan/nhc_udp.ko
 net/8021q/8021q.ko
 net/bluetooth/bluetooth.ko
 net/bluetooth/hidp/hidp.ko
@@ -17,6 +25,7 @@ net/bluetooth/rfcomm/rfcomm.ko
 net/can/can-bcm.ko
 net/can/can-gw.ko
 net/can/can-raw.ko
+net/ieee802154/6lowpan/ieee802154_6lowpan.ko
 net/mac80211/mac80211.ko
 net/nfc/nfc.ko
 net/rfkill/rfkill.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 569e0b7f358c..4e324a80ab8f 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -216,9 +216,9 @@ CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=m
-CONFIG_6LOWPAN=y
+CONFIG_6LOWPAN=m
 CONFIG_IEEE802154=y
-CONFIG_IEEE802154_6LOWPAN=y
+CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_MAC802154=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 8dc799d20796..c6ee8801900f 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -206,9 +206,9 @@ CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=m
-CONFIG_6LOWPAN=y
+CONFIG_6LOWPAN=m
 CONFIG_IEEE802154=y
-CONFIG_IEEE802154_6LOWPAN=y
+CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_MAC802154=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
diff --git a/modules.bzl b/modules.bzl
index a5a8dacdb5fd..f277893f5aed 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -12,6 +12,14 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",
     "mm/zsmalloc.ko",
+    "net/6lowpan/6lowpan.ko",
+    "net/6lowpan/nhc_dest.ko",
+    "net/6lowpan/nhc_fragment.ko",
+    "net/6lowpan/nhc_hop.ko",
+    "net/6lowpan/nhc_ipv6.ko",
+    "net/6lowpan/nhc_mobility.ko",
+    "net/6lowpan/nhc_routing.ko",
+    "net/6lowpan/nhc_udp.ko",
     "net/8021q/8021q.ko",
     "net/bluetooth/bluetooth.ko",
     "net/bluetooth/hidp/hidp.ko",
@@ -19,6 +27,7 @@ COMMON_GKI_MODULES_LIST = [
     "net/can/can-bcm.ko",
     "net/can/can-gw.ko",
     "net/can/can-raw.ko",
+    "net/ieee802154/6lowpan/ieee802154_6lowpan.ko",
     "net/mac80211/mac80211.ko",
     "net/nfc/nfc.ko",
     "net/rfkill/rfkill.ko",