summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornharold <nharold@google.com>2017-06-29 10:51:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-29 10:51:50 +0000
commite65b60680db49e80c28d758d042aa75d7a5617cf (patch)
tree612b7844880f828bb6c30359ffc3cf5539b7aba2
parentf9fb05fca0db824679c59da57c28819b761e1278 (diff)
parent1279c3f724cb2cb3cc0a6218690d874fbe6443d7 (diff)
downloadtests-e65b60680db49e80c28d758d042aa75d7a5617cf.tar.gz
Revert "Add VTI Configs to Networking Unit Tests" am: 5c1b6c8a85 am: 9537e9db2d am: d4a8395a9d
am: 1279c3f724 Change-Id: Id28647157590919d2457f06b16ec8df8e61e1552
-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 74b1463..268c6d7 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 NET_IPVTI IP6_VTI"
+OPTIONS="$OPTIONS CRYPTO_ECHAINIV"
OPTIONS="$OPTIONS SOCK_CGROUP_DATA CGROUP_BPF"
# For 3.1 kernels, where devtmpfs is not on by default.