diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-30 23:28:21 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-30 23:32:05 +0200 |
| commit | cea09329e50f5766b6b44149aa17e4a681546bbb (patch) | |
| tree | d0357252ebccba5b9cfdb93bce00e4469d8b63d0 /target/linux | |
| parent | c50ba61cafa616becf43e6a0148abea42935e03b (diff) | |
| download | upstream-cea09329e50f5766b6b44149aa17e4a681546bbb.tar.gz upstream-cea09329e50f5766b6b44149aa17e4a681546bbb.tar.bz2 upstream-cea09329e50f5766b6b44149aa17e4a681546bbb.zip | |
netfilter: fix file conflicts between kmod-ipt- and kmod-nft- packages
The nf_reject_* and nf_nat_masquerade_* modules are moved into the
corresponding kmod-nf- packages. Appropriate dependencies are added to the
kmod-nft- packages.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/config-3.18 | 1 | ||||
| -rw-r--r-- | target/linux/generic/config-4.1 | 1 | ||||
| -rw-r--r-- | target/linux/generic/config-4.4 | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18 index ab5e3b6f37..68fad28dc2 100644 --- 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 diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1 index d52c2f3db6..0b5eccb7ea 100644 --- a/target/linux/generic/config-4.1 +++ b/target/linux/generic/config-4.1 @@ -2717,6 +2717,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 diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 1f3f5850ae..c2d521f8c8 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -2706,6 +2706,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_NF_TABLES_NETDEV is not set # CONFIG_NI65 is not set |