projects
/
openwrt
/
staging
/
mkresin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c3c944
)
netfilter: Add fib support for nftables
author
Brett Mastbergen
<bmastbergen@untangle.com>
Tue, 11 Dec 2018 19:09:22 +0000
(14:09 -0500)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 15 Dec 2018 23:57:20 +0000
(
00:57
+0100)
Signed-off-by: Brett Mastbergen <bmastbergen@untangle.com>
include/netfilter.mk
patch
|
blob
|
history
package/kernel/linux/modules/netfilter.mk
patch
|
blob
|
history
target/linux/generic/config-4.14
patch
|
blob
|
history
target/linux/generic/config-4.19
patch
|
blob
|
history
diff --git
a/include/netfilter.mk
b/include/netfilter.mk
index 3a7f78a2a69091729496460787add977cd450721..179d4ed7b93ae763234e966c1027ae89e204b137 100644
(file)
--- a/
include/netfilter.mk
+++ b/
include/netfilter.mk
@@
-371,6
+371,11
@@
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_REDIR_IPV6, $(P_V6)nft_
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6),))
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_MASQ_IPV6, $(P_V6)nft_masq_ipv6),))
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6),))
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_MASQ_IPV6, $(P_V6)nft_masq_ipv6),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_FIB,CONFIG_NFT_FIB, $(P_XT)nft_fib),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_FIB,CONFIG_NFT_FIB_INET, $(P_XT)nft_fib_inet),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_FIB,CONFIG_NFT_FIB_IPV4, $(P_V4)nft_fib_ipv4),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_FIB,CONFIG_NFT_FIB_IPV6, $(P_V6)nft_fib_ipv6),))
+
# userland only
IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m)
# userland only
IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m)
diff --git
a/package/kernel/linux/modules/netfilter.mk
b/package/kernel/linux/modules/netfilter.mk
index 0ba66caf7de10abc4b2a2e2152ec83ed93128c5f..25715be5d1c443649b377779d708410e75f4a466 100644
(file)
--- a/
package/kernel/linux/modules/netfilter.mk
+++ b/
package/kernel/linux/modules/netfilter.mk
@@
-1164,3
+1164,15
@@
define KernelPackage/nft-netdev
endef
$(eval $(call KernelPackage,nft-netdev))
endef
$(eval $(call KernelPackage,nft-netdev))
+
+
+define KernelPackage/nft-fib
+ SUBMENU:=$(NF_MENU)
+ TITLE:=Netfilter nf_tables fib support
+ DEPENDS:=+kmod-nft-core
+ FILES:=$(foreach mod,$(NFT_FIB-m),$(LINUX_DIR)/net/$(mod).ko)
+ AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_FIB-m)))
+ KCONFIG:=$(KCONFIG_NFT_FIB)
+endef
+
+$(eval $(call KernelPackage,nft-fib))
diff --git
a/target/linux/generic/config-4.14
b/target/linux/generic/config-4.14
index 430e564e29762c6c7e9bbdec75b89276e91654d0..b6c3e4aa11e4d15ee7b542d3ed71f3c9532665d7 100644
(file)
--- a/
target/linux/generic/config-4.14
+++ b/
target/linux/generic/config-4.14
@@
-3164,6
+3164,7
@@
CONFIG_NFS_V3=y
# CONFIG_NFT_DUP_IPV6 is not set
# CONFIG_NFT_FIB_IPV4 is not set
# CONFIG_NFT_FIB_IPV6 is not set
# CONFIG_NFT_DUP_IPV6 is not set
# CONFIG_NFT_FIB_IPV4 is not set
# CONFIG_NFT_FIB_IPV6 is not set
+# CONFIG_NFT_FIB_NETDEV is not set
# CONFIG_NFT_FLOW_OFFLOAD is not set
# CONFIG_NFT_OBJREF is not set
# CONFIG_NFT_RT is not set
# CONFIG_NFT_FLOW_OFFLOAD is not set
# CONFIG_NFT_OBJREF is not set
# CONFIG_NFT_RT is not set
diff --git
a/target/linux/generic/config-4.19
b/target/linux/generic/config-4.19
index 0302cb605221f3eae762b4f97ebb327db7fca4c3..4a956a9b143a7289487ff158665a906b19fbb7c5 100644
(file)
--- a/
target/linux/generic/config-4.19
+++ b/
target/linux/generic/config-4.19
@@
-3309,6
+3309,7
@@
CONFIG_NFS_V3=y
# CONFIG_NFT_DUP_IPV6 is not set
# CONFIG_NFT_FIB_IPV4 is not set
# CONFIG_NFT_FIB_IPV6 is not set
# CONFIG_NFT_DUP_IPV6 is not set
# CONFIG_NFT_FIB_IPV4 is not set
# CONFIG_NFT_FIB_IPV6 is not set
+# CONFIG_NFT_FIB_NETDEV is not set
# CONFIG_NFT_FLOW_OFFLOAD is not set
# CONFIG_NFT_OBJREF is not set
# CONFIG_NFT_OSF is not set
# CONFIG_NFT_FLOW_OFFLOAD is not set
# CONFIG_NFT_OBJREF is not set
# CONFIG_NFT_OSF is not set