projects
/
openwrt
/
staging
/
blogic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
netfilter: fix file conflicts between kmod-ipt- and kmod-nft- packages
[openwrt/staging/blogic.git]
/
target
/
linux
/
generic
/
config-3.18
diff --git
a/target/linux/generic/config-3.18
b/target/linux/generic/config-3.18
index ab5e3b6f373055716a9868bebb31def09ed92c56..68fad28dc269e5f6b542d37e79c0419b9c81da18 100644
(file)
--- a/
target/linux/generic/config-3.18
+++ b/
target/linux/generic/config-3.18
@@
-2618,6
+2618,7
@@
CONFIG_NF_CONNTRACK_PROCFS=y
# CONFIG_NF_NAT_SNMP_BASIC is not set
# CONFIG_NF_NAT_TFTP is not set
# CONFIG_NF_REJECT_IPV4 is not set
+# CONFIG_NF_REJECT_IPV6 is not set
# CONFIG_NF_TABLES is not set
# CONFIG_NI52 is not set
# CONFIG_NI65 is not set