diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 09:48:39 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 09:48:39 +0100 |
| commit | d96f0a09ff22495dba2f19cb05d463d4671fd64d (patch) | |
| tree | 0860baffc936a445aee716b302f86a41d7b50f4e /extra/linux-zen/config | |
| parent | 826dadc3acc0f4548728a468efd034cefd8134e1 (diff) | |
| parent | fdfd65b8ab768294043d02e2b12469891e4d3c2d (diff) | |
| download | packages-d96f0a09ff22495dba2f19cb05d463d4671fd64d.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen/config')
| -rw-r--r-- | extra/linux-zen/config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/linux-zen/config b/extra/linux-zen/config index b68c8746..0f7ee4d3 100644 --- a/extra/linux-zen/config +++ b/extra/linux-zen/config @@ -1153,14 +1153,14 @@ CONFIG_NF_NAT_REDIRECT=y CONFIG_NETFILTER_SYNPROXY=m CONFIG_NF_OSF=m CONFIG_NF_TABLES=m -# CONFIG_NF_TABLES_SET is not set +CONFIG_NF_TABLES_SET=m CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_COUNTER=m -# CONFIG_NFT_CONNLIMIT is not set +CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m CONFIG_NFT_MASQ=m @@ -1175,7 +1175,7 @@ CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m CONFIG_NFT_FIB=m CONFIG_NFT_FIB_INET=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m |