summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-10-27 06:30:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-10-27 06:30:35 +0000
commit54f9bd922ac5d4fcfaa34e5878d6de264a565fde (patch)
treede81fe8a626f2ffa326173260f98e921e93e7e7f
parentc5ca81d0d4adc1da4325a89dc958b515691a4e0d (diff)
parent687e9aeed016ad1773583bd8b478b861480e8243 (diff)
downloadextras-54f9bd922ac5d4fcfaa34e5878d6de264a565fde.tar.gz
Merge "Add some Android-specific kernel options."
-rwxr-xr-xtests/net_test/run_net_test.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/net_test/run_net_test.sh b/tests/net_test/run_net_test.sh
index da83b92f..ddd24555 100755
--- a/tests/net_test/run_net_test.sh
+++ b/tests/net_test/run_net_test.sh
@@ -8,6 +8,10 @@ OPTIONS="$OPTIONS NETFILTER_XT_MARK NETFILTER_XT_TARGET_MARK"
OPTIONS="$OPTIONS IP_NF_IPTABLES IP_NF_MANGLE"
OPTIONS="$OPTIONS IP6_NF_IPTABLES IP6_NF_MANGLE INET6_IPCOMP"
OPTIONS="$OPTIONS IPV6_PRIVACY IPV6_OPTIMISTIC_DAD"
+OPTIONS="$OPTIONS CONFIG_NETFILTER_XT_TARGET_NFLOG"
+OPTIONS="$OPTIONS CONFIG_NETFILTER_XT_MATCH_QUOTA CONFIG_NETFILTER_XT_MATCH_QUOTA2"
+OPTIONS="$OPTIONS CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG"
+
# For 3.1 kernels, where devtmpfs is not on by default.
OPTIONS="$OPTIONS DEVTMPFS DEVTMPFS_MOUNT"