diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index a86027a2a369..02afcf7110ee 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -27,7 +27,10 @@ net/can/can-bcm.ko
 net/can/can-gw.ko
 net/can/can-raw.ko
 net/ieee802154/6lowpan/ieee802154_6lowpan.ko
+net/ieee802154/ieee802154.ko
+net/ieee802154/ieee802154_socket.ko
 net/mac80211/mac80211.ko
+net/mac802154/mac802154.ko
 net/nfc/nfc.ko
 net/rfkill/rfkill.ko
 net/tipc/diag.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index f2d0bad7dda4..235ba1b38318 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -217,9 +217,9 @@ CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=m
 CONFIG_6LOWPAN=m
-CONFIG_IEEE802154=y
+CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=y
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
@@ -639,6 +639,7 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ADIANTUM=y
 CONFIG_CRYPTO_HCTR2=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_MD5=y
@@ -652,6 +653,7 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=y
 CONFIG_CRYPTO_POLYVAL_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_TRACE_MMIO_ACCESS=y
+CONFIG_CRC_CCITT=y
 CONFIG_XZ_DEC=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 12aae44995f6..ae138f4a7a5a 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -207,9 +207,9 @@ CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=m
 CONFIG_6LOWPAN=m
-CONFIG_IEEE802154=y
+CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=y
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
@@ -582,6 +582,7 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ADIANTUM=y
 CONFIG_CRYPTO_HCTR2=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_MD5=y
@@ -594,6 +595,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_POLYVAL_CLMUL_NI=y
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA512_SSSE3=y
+CONFIG_CRC_CCITT=y
 CONFIG_CRC8=y
 CONFIG_XZ_DEC=y
 CONFIG_DMA_CMA=y
diff --git a/modules.bzl b/modules.bzl
index b69bea33e48b..9839a6c45719 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -29,7 +29,10 @@ COMMON_GKI_MODULES_LIST = [
     "net/can/can-gw.ko",
     "net/can/can-raw.ko",
     "net/ieee802154/6lowpan/ieee802154_6lowpan.ko",
+    "net/ieee802154/ieee802154.ko",
+    "net/ieee802154/ieee802154_socket.ko",
     "net/mac80211/mac80211.ko",
+    "net/mac802154/mac802154.ko",
     "net/nfc/nfc.ko",
     "net/rfkill/rfkill.ko",
     "net/tipc/diag.ko",