Skip to content

Commit 8f4089b

Browse files
pelwellpopcornmix
authored andcommitted
configs: Restore missing NF_TABLES settings
The arm bcm2711_defconfig and the arm64 bcmrpi3_defconfig have been missing their NF_TABLES settings. Restore them. See: #3615 Signed-off-by: Phil Elwell <[email protected]>
1 parent 2ba60e5 commit 8f4089b

File tree

2 files changed

+80
-0
lines changed

2 files changed

+80
-0
lines changed

arch/arm/configs/bcm2711_defconfig

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,36 @@ CONFIG_NF_CONNTRACK_SANE=m
137137
CONFIG_NF_CONNTRACK_SIP=m
138138
CONFIG_NF_CONNTRACK_TFTP=m
139139
CONFIG_NF_CT_NETLINK=m
140+
CONFIG_NF_TABLES=m
141+
CONFIG_NF_TABLES_SET=m
142+
CONFIG_NF_TABLES_INET=y
143+
CONFIG_NF_TABLES_NETDEV=y
144+
CONFIG_NFT_NUMGEN=m
145+
CONFIG_NFT_CT=m
146+
CONFIG_NFT_FLOW_OFFLOAD=m
147+
CONFIG_NFT_COUNTER=m
148+
CONFIG_NFT_CONNLIMIT=m
149+
CONFIG_NFT_LOG=m
150+
CONFIG_NFT_LIMIT=m
151+
CONFIG_NFT_MASQ=m
152+
CONFIG_NFT_REDIR=m
153+
CONFIG_NFT_NAT=m
154+
CONFIG_NFT_TUNNEL=m
155+
CONFIG_NFT_OBJREF=m
156+
CONFIG_NFT_QUEUE=m
157+
CONFIG_NFT_QUOTA=m
158+
CONFIG_NFT_REJECT=m
159+
CONFIG_NFT_COMPAT=m
160+
CONFIG_NFT_HASH=m
161+
CONFIG_NFT_FIB_INET=m
162+
CONFIG_NFT_SOCKET=m
163+
CONFIG_NFT_OSF=m
164+
CONFIG_NFT_TPROXY=m
165+
CONFIG_NFT_DUP_NETDEV=m
166+
CONFIG_NFT_FWD_NETDEV=m
167+
CONFIG_NFT_FIB_NETDEV=m
168+
CONFIG_NF_FLOW_TABLE_INET=m
169+
CONFIG_NF_FLOW_TABLE=m
140170
CONFIG_NETFILTER_XT_SET=m
141171
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
142172
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -224,6 +254,10 @@ CONFIG_IP_VS_SED=m
224254
CONFIG_IP_VS_NQ=m
225255
CONFIG_IP_VS_FTP=m
226256
CONFIG_IP_VS_PE_SIP=m
257+
CONFIG_NFT_DUP_IPV4=m
258+
CONFIG_NFT_FIB_IPV4=m
259+
CONFIG_NF_TABLES_ARP=y
260+
CONFIG_NF_FLOW_TABLE_IPV4=m
227261
CONFIG_IP_NF_IPTABLES=m
228262
CONFIG_IP_NF_MATCH_AH=m
229263
CONFIG_IP_NF_MATCH_ECN=m
@@ -243,6 +277,9 @@ CONFIG_IP_NF_RAW=m
243277
CONFIG_IP_NF_ARPTABLES=m
244278
CONFIG_IP_NF_ARPFILTER=m
245279
CONFIG_IP_NF_ARP_MANGLE=m
280+
CONFIG_NFT_DUP_IPV6=m
281+
CONFIG_NFT_FIB_IPV6=m
282+
CONFIG_NF_FLOW_TABLE_IPV6=m
246283
CONFIG_IP6_NF_IPTABLES=m
247284
CONFIG_IP6_NF_MATCH_AH=m
248285
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -261,6 +298,9 @@ CONFIG_IP6_NF_RAW=m
261298
CONFIG_IP6_NF_NAT=m
262299
CONFIG_IP6_NF_TARGET_MASQUERADE=m
263300
CONFIG_IP6_NF_TARGET_NPT=m
301+
CONFIG_NF_TABLES_BRIDGE=m
302+
CONFIG_NFT_BRIDGE_REJECT=m
303+
CONFIG_NF_LOG_BRIDGE=m
264304
CONFIG_BRIDGE_NF_EBTABLES=m
265305
CONFIG_BRIDGE_EBT_BROUTE=m
266306
CONFIG_BRIDGE_EBT_T_FILTER=m

arch/arm64/configs/bcmrpi3_defconfig

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,36 @@ CONFIG_NF_CONNTRACK_SANE=m
127127
CONFIG_NF_CONNTRACK_SIP=m
128128
CONFIG_NF_CONNTRACK_TFTP=m
129129
CONFIG_NF_CT_NETLINK=m
130+
CONFIG_NF_TABLES=m
131+
CONFIG_NF_TABLES_SET=m
132+
CONFIG_NF_TABLES_INET=y
133+
CONFIG_NF_TABLES_NETDEV=y
134+
CONFIG_NFT_NUMGEN=m
135+
CONFIG_NFT_CT=m
136+
CONFIG_NFT_FLOW_OFFLOAD=m
137+
CONFIG_NFT_COUNTER=m
138+
CONFIG_NFT_CONNLIMIT=m
139+
CONFIG_NFT_LOG=m
140+
CONFIG_NFT_LIMIT=m
141+
CONFIG_NFT_MASQ=m
142+
CONFIG_NFT_REDIR=m
143+
CONFIG_NFT_NAT=m
144+
CONFIG_NFT_TUNNEL=m
145+
CONFIG_NFT_OBJREF=m
146+
CONFIG_NFT_QUEUE=m
147+
CONFIG_NFT_QUOTA=m
148+
CONFIG_NFT_REJECT=m
149+
CONFIG_NFT_COMPAT=m
150+
CONFIG_NFT_HASH=m
151+
CONFIG_NFT_FIB_INET=m
152+
CONFIG_NFT_SOCKET=m
153+
CONFIG_NFT_OSF=m
154+
CONFIG_NFT_TPROXY=m
155+
CONFIG_NFT_DUP_NETDEV=m
156+
CONFIG_NFT_FWD_NETDEV=m
157+
CONFIG_NFT_FIB_NETDEV=m
158+
CONFIG_NF_FLOW_TABLE_INET=m
159+
CONFIG_NF_FLOW_TABLE=m
130160
CONFIG_NETFILTER_XT_SET=m
131161
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
132162
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -214,6 +244,10 @@ CONFIG_IP_VS_SED=m
214244
CONFIG_IP_VS_NQ=m
215245
CONFIG_IP_VS_FTP=m
216246
CONFIG_IP_VS_PE_SIP=m
247+
CONFIG_NFT_DUP_IPV4=m
248+
CONFIG_NFT_FIB_IPV4=m
249+
CONFIG_NF_TABLES_ARP=y
250+
CONFIG_NF_FLOW_TABLE_IPV4=m
217251
CONFIG_IP_NF_IPTABLES=m
218252
CONFIG_IP_NF_MATCH_AH=m
219253
CONFIG_IP_NF_MATCH_ECN=m
@@ -233,6 +267,9 @@ CONFIG_IP_NF_RAW=m
233267
CONFIG_IP_NF_ARPTABLES=m
234268
CONFIG_IP_NF_ARPFILTER=m
235269
CONFIG_IP_NF_ARP_MANGLE=m
270+
CONFIG_NFT_DUP_IPV6=m
271+
CONFIG_NFT_FIB_IPV6=m
272+
CONFIG_NF_FLOW_TABLE_IPV6=m
236273
CONFIG_IP6_NF_IPTABLES=m
237274
CONFIG_IP6_NF_MATCH_AH=m
238275
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -251,6 +288,9 @@ CONFIG_IP6_NF_RAW=m
251288
CONFIG_IP6_NF_NAT=m
252289
CONFIG_IP6_NF_TARGET_MASQUERADE=m
253290
CONFIG_IP6_NF_TARGET_NPT=m
291+
CONFIG_NF_TABLES_BRIDGE=m
292+
CONFIG_NFT_BRIDGE_REJECT=m
293+
CONFIG_NF_LOG_BRIDGE=m
254294
CONFIG_BRIDGE_NF_EBTABLES=m
255295
CONFIG_BRIDGE_EBT_BROUTE=m
256296
CONFIG_BRIDGE_EBT_T_FILTER=m

0 commit comments

Comments
 (0)