diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-06-13 05:55:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 05:55:40 +0000 |
| commit | 2e7e8263cd7f4c87327a0cf7a31dcadad5ec4894 (patch) | |
| tree | 3f5e33f7a2420f602717e9005a0974119c4fecda | |
| parent | b50a97ca52c473b3b4227393e2e1ad640c857eb9 (diff) | |
| parent | 4277ca136ca2b7bb459b16b81bce38c1deb5f422 (diff) | |
| download | tests-2e7e8263cd7f4c87327a0cf7a31dcadad5ec4894.tar.gz | |
Merge "Turn on /proc/net/xfrm_stat in kernel config." am: 6f58aa2f9d
am: 4277ca136c
Change-Id: I211ee1b5d367bfed99c8a326c939c9289c13c561
| -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" |