diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-06-13 05:59:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 05:59:41 +0000 |
| commit | 34f0c19c4489e97130d46b5b87099601f79e9ddb (patch) | |
| tree | 3f5e33f7a2420f602717e9005a0974119c4fecda | |
| parent | c9d4b8e6557d71bdc4dd6f28b677419fc170e5d8 (diff) | |
| parent | 2e7e8263cd7f4c87327a0cf7a31dcadad5ec4894 (diff) | |
| download | tests-34f0c19c4489e97130d46b5b87099601f79e9ddb.tar.gz | |
Merge "Turn on /proc/net/xfrm_stat in kernel config." am: 6f58aa2f9d am: 4277ca136c
am: 2e7e8263cd
Change-Id: I0f03f4a83d938efa23450a1d4a740078b2f7cfd0
| -rwxr-xr-x | net/test/run_net_test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh index 8d60bea..bfba4db 100755 --- a/net/test/run_net_test.sh +++ b/net/test/run_net_test.sh @@ -21,9 +21,9 @@ OPTIONS="$OPTIONS CONFIG_INET_UDP_DIAG CONFIG_INET_DIAG_DESTROY" OPTIONS="$OPTIONS IP_SCTP INET_SCTP_DIAG" OPTIONS="$OPTIONS CONFIG_IP_NF_TARGET_REJECT CONFIG_IP_NF_TARGET_REJECT_SKERR" OPTIONS="$OPTIONS CONFIG_IP6_NF_TARGET_REJECT CONFIG_IP6_NF_TARGET_REJECT_SKERR" -OPTIONS="$OPTIONS BPF_SYSCALL NET_KEY XFRM_USER CRYPTO_CBC CRYPTO_CTR" -OPTIONS="$OPTIONS CRYPTO_HMAC CRYPTO_AES CRYPTO_SHA1 CRYPTO_SHA256 CRYPTO_SHA12" -OPTIONS="$OPTIONS CRYPTO_USER INET_AH INET_ESP INET_XFRM_MODE" +OPTIONS="$OPTIONS BPF_SYSCALL NET_KEY XFRM_USER XFRM_STATISTICS CRYPTO_CBC" +OPTIONS="$OPTIONS CRYPTO_CTR CRYPTO_HMAC CRYPTO_AES CRYPTO_SHA1 CRYPTO_SHA256" +OPTIONS="$OPTIONS CRYPTO_SHA12 CRYPTO_USER INET_AH INET_ESP INET_XFRM_MODE" OPTIONS="$OPTIONS TRANSPORT INET_XFRM_MODE_TUNNEL INET6_AH INET6_ESP" OPTIONS="$OPTIONS INET6_XFRM_MODE_TRANSPORT INET6_XFRM_MODE_TUNNEL" OPTIONS="$OPTIONS CRYPTO_SHA256 CRYPTO_SHA512 CRYPTO_AES_X86_64" |