Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98af233d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable support for destroying TCP sockets through diag"

parents 9e59905b 44238114

arch/arm64/configs/msm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_ESP=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/arm64/configs/msm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ CONFIG_INET_AH=y 
CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/um/configs/x86_64_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y

# CONFIG_IPV6 is not set

CONFIG_UML_NET=y

CONFIG_UML_NET_ETHERTAP=y