summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-07-01 06:32:36 +0000
committerLorenzo Colitti <lorenzo@google.com>2017-07-01 06:32:36 +0000
commita32e3eadb010ed3143bcebe0b588678b7627884b (patch)
tree65c59e2dfa8fbd203c389629b89c865003179569
parent5c1b6c8a855bccc16bb27919d74e8b28102a5a4e (diff)
downloadtests-a32e3eadb010ed3143bcebe0b588678b7627884b.tar.gz
Revert "Revert "Add VTI Configs to Networking Unit Tests""
The manifests for android-msm-{angler-bullhead}-3.10-oc have been fixed, so we can roll this forward again. This reverts commit 5c1b6c8a855bccc16bb27919d74e8b28102a5a4e. Change-Id: I3210bd806705a97f829dae6d5d4a0c355eec5277
-rwxr-xr-xnet/test/run_net_test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index 268c6d7..74b1463 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -27,7 +27,7 @@ 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"
-OPTIONS="$OPTIONS CRYPTO_ECHAINIV"
+OPTIONS="$OPTIONS CRYPTO_ECHAINIV NET_IPVTI IP6_VTI"
OPTIONS="$OPTIONS SOCK_CGROUP_DATA CGROUP_BPF"
# For 3.1 kernels, where devtmpfs is not on by default.