projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
tools
/
testing
/
selftests
/
wireguard
/
qemu
/
kernel.config
diff --git
a/tools/testing/selftests/wireguard/qemu/kernel.config
b/tools/testing/selftests/wireguard/qemu/kernel.config
index
4eecb43
..
74db83a
100644
(file)
--- a/
tools/testing/selftests/wireguard/qemu/kernel.config
+++ b/
tools/testing/selftests/wireguard/qemu/kernel.config
@@
-19,7
+19,6
@@
CONFIG_NETFILTER_XTABLES=y
CONFIG_NETFILTER_XT_NAT=y
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
CONFIG_NETFILTER_XT_MARK=y
-CONFIG_NF_CONNTRACK_IPV4=y
CONFIG_NF_NAT_IPV4=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_FILTER=y