diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index 4775bb040082..6c0c491ae76c 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -12,7 +12,6 @@ drivers/bluetooth/btbcm.ko
 drivers/bluetooth/btqca.ko
 net/8021q/8021q.ko
 net/wireless/cfg80211.ko
-net/ieee802154/6lowpan/ieee802154_6lowpan.ko
 net/can/can.ko
 net/can/can-raw.ko
 net/can/can-bcm.ko
@@ -32,4 +31,8 @@ net/6lowpan/nhc_ipv6.ko
 net/6lowpan/nhc_mobility.ko
 net/6lowpan/nhc_routing.ko
 net/6lowpan/nhc_udp.ko
+net/ieee802154/6lowpan/ieee802154_6lowpan.ko
+net/ieee802154/ieee802154.ko
+net/ieee802154/ieee802154_socket.ko
+net/mac802154/mac802154.ko
 net/nfc/nfc.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 47592141f40b..9f220eca2809 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 4fd196e5c3df..05a62c33b7f3 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -235,9 +235,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
@@ -660,6 +660,7 @@ CONFIG_STATIC_USERMODEHELPER_PATH=""
 CONFIG_SECURITY_SELINUX=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
 CONFIG_CRYPTO_ADIANTUM=y
 CONFIG_CRYPTO_HCTR2=y
@@ -672,6 +673,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRC_CCITT=y
 CONFIG_XZ_DEC=y
 CONFIG_DMA_RESTRICTED_POOL=y
 CONFIG_DMA_CMA=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index daefc7b5cd9c..b497b58c9626 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -216,9 +216,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
@@ -593,6 +593,7 @@ CONFIG_STATIC_USERMODEHELPER_PATH=""
 CONFIG_SECURITY_SELINUX=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
 CONFIG_CRYPTO_ADIANTUM=y
 CONFIG_CRYPTO_HCTR2=y
@@ -609,6 +610,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_CRYPTO_ANSI_CPRNG=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 9625420b8326..bee7fc6d7161 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",