Skip to content

Commit 7ad2697

Browse files
author
Florian Westphal
committed
netfilter: ebtables: allow xtables-nft only builds
Same patch as previous one, but for ebtables. To build a kernel that only supports ebtables-nft, the builtin tables need to be disabled, i.e.: CONFIG_BRIDGE_EBT_BROUTE=n CONFIG_BRIDGE_EBT_T_FILTER=n CONFIG_BRIDGE_EBT_T_NAT=n The ebtables specific extensions can then be used nftables' NFT_COMPAT interface. Signed-off-by: Florian Westphal <[email protected]>
1 parent a9525c7 commit 7ad2697

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

net/bridge/netfilter/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ config NF_CONNTRACK_BRIDGE
3939

4040
To compile it as a module, choose M here. If unsure, say N.
4141

42+
# old sockopt interface and eval loop
43+
config BRIDGE_NF_EBTABLES_LEGACY
44+
tristate
45+
4246
menuconfig BRIDGE_NF_EBTABLES
4347
tristate "Ethernet Bridge tables (ebtables) support"
4448
depends on BRIDGE && NETFILTER && NETFILTER_XTABLES
@@ -55,6 +59,7 @@ if BRIDGE_NF_EBTABLES
5559
#
5660
config BRIDGE_EBT_BROUTE
5761
tristate "ebt: broute table support"
62+
select BRIDGE_NF_EBTABLES_LEGACY
5863
help
5964
The ebtables broute table is used to define rules that decide between
6065
bridging and routing frames, giving Linux the functionality of a
@@ -65,6 +70,7 @@ config BRIDGE_EBT_BROUTE
6570

6671
config BRIDGE_EBT_T_FILTER
6772
tristate "ebt: filter table support"
73+
select BRIDGE_NF_EBTABLES_LEGACY
6874
help
6975
The ebtables filter table is used to define frame filtering rules at
7076
local input, forwarding and local output. See the man page for
@@ -74,6 +80,7 @@ config BRIDGE_EBT_T_FILTER
7480

7581
config BRIDGE_EBT_T_NAT
7682
tristate "ebt: nat table support"
83+
select BRIDGE_NF_EBTABLES_LEGACY
7784
help
7885
The ebtables nat table is used to define rules that alter the MAC
7986
source address (MAC SNAT) or the MAC destination address (MAC DNAT).

net/bridge/netfilter/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ obj-$(CONFIG_NFT_BRIDGE_REJECT) += nft_reject_bridge.o
99
# connection tracking
1010
obj-$(CONFIG_NF_CONNTRACK_BRIDGE) += nf_conntrack_bridge.o
1111

12-
obj-$(CONFIG_BRIDGE_NF_EBTABLES) += ebtables.o
12+
obj-$(CONFIG_BRIDGE_NF_EBTABLES_LEGACY) += ebtables.o
1313

1414
# tables
1515
obj-$(CONFIG_BRIDGE_EBT_BROUTE) += ebtable_broute.o

0 commit comments

Comments
 (0)