From 37913822f609102d533bd09c53a8cb773cefa0cd Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Sun, 31 Jan 2021 22:50:56 +0000 Subject: [PATCH] Revert "ANDROID: GKI: bring WPAN into GKI" This reverts commit adef4d1d97d512a038aacfb8c5b4711e25158cee. Reason for revert: submitted prematurely Bug: 175144495 Change-Id: I65b60f5fee7b6f467e8500ea1688cca0305ae961 --- arch/arm64/configs/gki_defconfig | 5 +---- arch/x86/configs/gki_defconfig | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 42eee6862f16..e8a41dc61dc1 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -203,10 +203,6 @@ CONFIG_IP6_NF_RAW=y CONFIG_TIPC=y CONFIG_L2TP=y CONFIG_BRIDGE=y -CONFIG_6LOWPAN=y -CONFIG_IEEE802154=y -CONFIG_IEEE802154_6LOWPAN=y -CONFIG_MAC802154=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y @@ -587,6 +583,7 @@ CONFIG_CRYPTO_MD5=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/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 34719baa1139..432f3cf37fe1 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -183,10 +183,6 @@ CONFIG_IP6_NF_RAW=y CONFIG_TIPC=y CONFIG_L2TP=y CONFIG_BRIDGE=y -CONFIG_6LOWPAN=y -CONFIG_IEEE802154=y -CONFIG_IEEE802154_6LOWPAN=y -CONFIG_MAC802154=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y