diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-01-17 11:23:52 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-01-31 09:00:59 -0500 |
commit | 4436820a98cdaf497a874323095e328831030956 (patch) | |
tree | c2102f3ae4416ab83ac933c0a93b53935729f1cf /arch/m68k | |
parent | 9a10555c6949982e6f98007dc71c15bd8ccb965a (diff) |
m68k/defconfig: Enable Ethernet bridging
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 27 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 27 |
12 files changed, 324 insertions, 0 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index c23afcc54458..1a10a08ebec7 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -147,6 +147,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
147 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 147 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
148 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 148 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
149 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 149 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
150 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
150 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 151 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
151 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 152 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
152 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 153 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -226,12 +227,38 @@ CONFIG_IP6_NF_RAW=m | |||
226 | CONFIG_IP6_NF_NAT=m | 227 | CONFIG_IP6_NF_NAT=m |
227 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 228 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
228 | CONFIG_IP6_NF_TARGET_NPT=m | 229 | CONFIG_IP6_NF_TARGET_NPT=m |
230 | CONFIG_NF_TABLES_BRIDGE=m | ||
231 | CONFIG_NFT_BRIDGE_META=m | ||
232 | CONFIG_NFT_BRIDGE_REJECT=m | ||
233 | CONFIG_NF_LOG_BRIDGE=m | ||
234 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
235 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
236 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
237 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
238 | CONFIG_BRIDGE_EBT_802_3=m | ||
239 | CONFIG_BRIDGE_EBT_AMONG=m | ||
240 | CONFIG_BRIDGE_EBT_ARP=m | ||
241 | CONFIG_BRIDGE_EBT_IP=m | ||
242 | CONFIG_BRIDGE_EBT_IP6=m | ||
243 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
244 | CONFIG_BRIDGE_EBT_MARK=m | ||
245 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
246 | CONFIG_BRIDGE_EBT_STP=m | ||
247 | CONFIG_BRIDGE_EBT_VLAN=m | ||
248 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
249 | CONFIG_BRIDGE_EBT_DNAT=m | ||
250 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
251 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
252 | CONFIG_BRIDGE_EBT_SNAT=m | ||
253 | CONFIG_BRIDGE_EBT_LOG=m | ||
254 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
229 | CONFIG_IP_DCCP=m | 255 | CONFIG_IP_DCCP=m |
230 | # CONFIG_IP_DCCP_CCID3 is not set | 256 | # CONFIG_IP_DCCP_CCID3 is not set |
231 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 257 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
232 | CONFIG_RDS=m | 258 | CONFIG_RDS=m |
233 | CONFIG_RDS_TCP=m | 259 | CONFIG_RDS_TCP=m |
234 | CONFIG_L2TP=m | 260 | CONFIG_L2TP=m |
261 | CONFIG_BRIDGE=m | ||
235 | CONFIG_ATALK=m | 262 | CONFIG_ATALK=m |
236 | CONFIG_6LOWPAN=m | 263 | CONFIG_6LOWPAN=m |
237 | CONFIG_DNS_RESOLVER=y | 264 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index c72fcbd11a9e..7859a738c81e 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -145,6 +145,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
145 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 145 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
146 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 146 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
147 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 147 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
148 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
148 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 149 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
149 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 150 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
150 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 151 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -224,12 +225,38 @@ CONFIG_IP6_NF_RAW=m | |||
224 | CONFIG_IP6_NF_NAT=m | 225 | CONFIG_IP6_NF_NAT=m |
225 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 226 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
226 | CONFIG_IP6_NF_TARGET_NPT=m | 227 | CONFIG_IP6_NF_TARGET_NPT=m |
228 | CONFIG_NF_TABLES_BRIDGE=m | ||
229 | CONFIG_NFT_BRIDGE_META=m | ||
230 | CONFIG_NFT_BRIDGE_REJECT=m | ||
231 | CONFIG_NF_LOG_BRIDGE=m | ||
232 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
233 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
234 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
235 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
236 | CONFIG_BRIDGE_EBT_802_3=m | ||
237 | CONFIG_BRIDGE_EBT_AMONG=m | ||
238 | CONFIG_BRIDGE_EBT_ARP=m | ||
239 | CONFIG_BRIDGE_EBT_IP=m | ||
240 | CONFIG_BRIDGE_EBT_IP6=m | ||
241 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
242 | CONFIG_BRIDGE_EBT_MARK=m | ||
243 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
244 | CONFIG_BRIDGE_EBT_STP=m | ||
245 | CONFIG_BRIDGE_EBT_VLAN=m | ||
246 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
247 | CONFIG_BRIDGE_EBT_DNAT=m | ||
248 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
249 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
250 | CONFIG_BRIDGE_EBT_SNAT=m | ||
251 | CONFIG_BRIDGE_EBT_LOG=m | ||
252 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
227 | CONFIG_IP_DCCP=m | 253 | CONFIG_IP_DCCP=m |
228 | # CONFIG_IP_DCCP_CCID3 is not set | 254 | # CONFIG_IP_DCCP_CCID3 is not set |
229 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 255 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
230 | CONFIG_RDS=m | 256 | CONFIG_RDS=m |
231 | CONFIG_RDS_TCP=m | 257 | CONFIG_RDS_TCP=m |
232 | CONFIG_L2TP=m | 258 | CONFIG_L2TP=m |
259 | CONFIG_BRIDGE=m | ||
233 | CONFIG_ATALK=m | 260 | CONFIG_ATALK=m |
234 | CONFIG_6LOWPAN=m | 261 | CONFIG_6LOWPAN=m |
235 | CONFIG_DNS_RESOLVER=y | 262 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 776964f25774..372593a3b398 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -145,6 +145,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
145 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 145 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
146 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 146 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
147 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 147 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
148 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
148 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 149 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
149 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 150 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
150 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 151 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -224,12 +225,38 @@ CONFIG_IP6_NF_RAW=m | |||
224 | CONFIG_IP6_NF_NAT=m | 225 | CONFIG_IP6_NF_NAT=m |
225 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 226 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
226 | CONFIG_IP6_NF_TARGET_NPT=m | 227 | CONFIG_IP6_NF_TARGET_NPT=m |
228 | CONFIG_NF_TABLES_BRIDGE=m | ||
229 | CONFIG_NFT_BRIDGE_META=m | ||
230 | CONFIG_NFT_BRIDGE_REJECT=m | ||
231 | CONFIG_NF_LOG_BRIDGE=m | ||
232 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
233 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
234 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
235 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
236 | CONFIG_BRIDGE_EBT_802_3=m | ||
237 | CONFIG_BRIDGE_EBT_AMONG=m | ||
238 | CONFIG_BRIDGE_EBT_ARP=m | ||
239 | CONFIG_BRIDGE_EBT_IP=m | ||
240 | CONFIG_BRIDGE_EBT_IP6=m | ||
241 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
242 | CONFIG_BRIDGE_EBT_MARK=m | ||
243 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
244 | CONFIG_BRIDGE_EBT_STP=m | ||
245 | CONFIG_BRIDGE_EBT_VLAN=m | ||
246 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
247 | CONFIG_BRIDGE_EBT_DNAT=m | ||
248 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
249 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
250 | CONFIG_BRIDGE_EBT_SNAT=m | ||
251 | CONFIG_BRIDGE_EBT_LOG=m | ||
252 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
227 | CONFIG_IP_DCCP=m | 253 | CONFIG_IP_DCCP=m |
228 | # CONFIG_IP_DCCP_CCID3 is not set | 254 | # CONFIG_IP_DCCP_CCID3 is not set |
229 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 255 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
230 | CONFIG_RDS=m | 256 | CONFIG_RDS=m |
231 | CONFIG_RDS_TCP=m | 257 | CONFIG_RDS_TCP=m |
232 | CONFIG_L2TP=m | 258 | CONFIG_L2TP=m |
259 | CONFIG_BRIDGE=m | ||
233 | CONFIG_ATALK=m | 260 | CONFIG_ATALK=m |
234 | CONFIG_6LOWPAN=m | 261 | CONFIG_6LOWPAN=m |
235 | CONFIG_DNS_RESOLVER=y | 262 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 41a5a0e60c2a..f3bd35e76ea4 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -143,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
143 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 143 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
144 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 144 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
145 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 145 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
146 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
146 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 147 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
147 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 148 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
148 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 149 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -222,12 +223,38 @@ CONFIG_IP6_NF_RAW=m | |||
222 | CONFIG_IP6_NF_NAT=m | 223 | CONFIG_IP6_NF_NAT=m |
223 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 224 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
224 | CONFIG_IP6_NF_TARGET_NPT=m | 225 | CONFIG_IP6_NF_TARGET_NPT=m |
226 | CONFIG_NF_TABLES_BRIDGE=m | ||
227 | CONFIG_NFT_BRIDGE_META=m | ||
228 | CONFIG_NFT_BRIDGE_REJECT=m | ||
229 | CONFIG_NF_LOG_BRIDGE=m | ||
230 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
231 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
232 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
233 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
234 | CONFIG_BRIDGE_EBT_802_3=m | ||
235 | CONFIG_BRIDGE_EBT_AMONG=m | ||
236 | CONFIG_BRIDGE_EBT_ARP=m | ||
237 | CONFIG_BRIDGE_EBT_IP=m | ||
238 | CONFIG_BRIDGE_EBT_IP6=m | ||
239 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
240 | CONFIG_BRIDGE_EBT_MARK=m | ||
241 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
242 | CONFIG_BRIDGE_EBT_STP=m | ||
243 | CONFIG_BRIDGE_EBT_VLAN=m | ||
244 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
245 | CONFIG_BRIDGE_EBT_DNAT=m | ||
246 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
247 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
248 | CONFIG_BRIDGE_EBT_SNAT=m | ||
249 | CONFIG_BRIDGE_EBT_LOG=m | ||
250 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
225 | CONFIG_IP_DCCP=m | 251 | CONFIG_IP_DCCP=m |
226 | # CONFIG_IP_DCCP_CCID3 is not set | 252 | # CONFIG_IP_DCCP_CCID3 is not set |
227 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 253 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
228 | CONFIG_RDS=m | 254 | CONFIG_RDS=m |
229 | CONFIG_RDS_TCP=m | 255 | CONFIG_RDS_TCP=m |
230 | CONFIG_L2TP=m | 256 | CONFIG_L2TP=m |
257 | CONFIG_BRIDGE=m | ||
231 | CONFIG_ATALK=m | 258 | CONFIG_ATALK=m |
232 | CONFIG_6LOWPAN=m | 259 | CONFIG_6LOWPAN=m |
233 | CONFIG_DNS_RESOLVER=y | 260 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index f36a1ac8e5c0..9f9793fb2b73 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -145,6 +145,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
145 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 145 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
146 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 146 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
147 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 147 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
148 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
148 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 149 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
149 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 150 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
150 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 151 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -224,12 +225,38 @@ CONFIG_IP6_NF_RAW=m | |||
224 | CONFIG_IP6_NF_NAT=m | 225 | CONFIG_IP6_NF_NAT=m |
225 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 226 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
226 | CONFIG_IP6_NF_TARGET_NPT=m | 227 | CONFIG_IP6_NF_TARGET_NPT=m |
228 | CONFIG_NF_TABLES_BRIDGE=m | ||
229 | CONFIG_NFT_BRIDGE_META=m | ||
230 | CONFIG_NFT_BRIDGE_REJECT=m | ||
231 | CONFIG_NF_LOG_BRIDGE=m | ||
232 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
233 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
234 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
235 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
236 | CONFIG_BRIDGE_EBT_802_3=m | ||
237 | CONFIG_BRIDGE_EBT_AMONG=m | ||
238 | CONFIG_BRIDGE_EBT_ARP=m | ||
239 | CONFIG_BRIDGE_EBT_IP=m | ||
240 | CONFIG_BRIDGE_EBT_IP6=m | ||
241 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
242 | CONFIG_BRIDGE_EBT_MARK=m | ||
243 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
244 | CONFIG_BRIDGE_EBT_STP=m | ||
245 | CONFIG_BRIDGE_EBT_VLAN=m | ||
246 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
247 | CONFIG_BRIDGE_EBT_DNAT=m | ||
248 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
249 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
250 | CONFIG_BRIDGE_EBT_SNAT=m | ||
251 | CONFIG_BRIDGE_EBT_LOG=m | ||
252 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
227 | CONFIG_IP_DCCP=m | 253 | CONFIG_IP_DCCP=m |
228 | # CONFIG_IP_DCCP_CCID3 is not set | 254 | # CONFIG_IP_DCCP_CCID3 is not set |
229 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 255 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
230 | CONFIG_RDS=m | 256 | CONFIG_RDS=m |
231 | CONFIG_RDS_TCP=m | 257 | CONFIG_RDS_TCP=m |
232 | CONFIG_L2TP=m | 258 | CONFIG_L2TP=m |
259 | CONFIG_BRIDGE=m | ||
233 | CONFIG_ATALK=m | 260 | CONFIG_ATALK=m |
234 | CONFIG_6LOWPAN=m | 261 | CONFIG_6LOWPAN=m |
235 | CONFIG_DNS_RESOLVER=y | 262 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index b9479aa87f28..89f225c01a0b 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -144,6 +144,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
144 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 144 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
145 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 145 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
146 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 146 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
147 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
147 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 148 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
148 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 149 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
149 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 150 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -223,12 +224,38 @@ CONFIG_IP6_NF_RAW=m | |||
223 | CONFIG_IP6_NF_NAT=m | 224 | CONFIG_IP6_NF_NAT=m |
224 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 225 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
225 | CONFIG_IP6_NF_TARGET_NPT=m | 226 | CONFIG_IP6_NF_TARGET_NPT=m |
227 | CONFIG_NF_TABLES_BRIDGE=m | ||
228 | CONFIG_NFT_BRIDGE_META=m | ||
229 | CONFIG_NFT_BRIDGE_REJECT=m | ||
230 | CONFIG_NF_LOG_BRIDGE=m | ||
231 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
232 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
233 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
234 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
235 | CONFIG_BRIDGE_EBT_802_3=m | ||
236 | CONFIG_BRIDGE_EBT_AMONG=m | ||
237 | CONFIG_BRIDGE_EBT_ARP=m | ||
238 | CONFIG_BRIDGE_EBT_IP=m | ||
239 | CONFIG_BRIDGE_EBT_IP6=m | ||
240 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
241 | CONFIG_BRIDGE_EBT_MARK=m | ||
242 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
243 | CONFIG_BRIDGE_EBT_STP=m | ||
244 | CONFIG_BRIDGE_EBT_VLAN=m | ||
245 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
246 | CONFIG_BRIDGE_EBT_DNAT=m | ||
247 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
248 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
249 | CONFIG_BRIDGE_EBT_SNAT=m | ||
250 | CONFIG_BRIDGE_EBT_LOG=m | ||
251 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
226 | CONFIG_IP_DCCP=m | 252 | CONFIG_IP_DCCP=m |
227 | # CONFIG_IP_DCCP_CCID3 is not set | 253 | # CONFIG_IP_DCCP_CCID3 is not set |
228 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 254 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
229 | CONFIG_RDS=m | 255 | CONFIG_RDS=m |
230 | CONFIG_RDS_TCP=m | 256 | CONFIG_RDS_TCP=m |
231 | CONFIG_L2TP=m | 257 | CONFIG_L2TP=m |
258 | CONFIG_BRIDGE=m | ||
232 | CONFIG_ATALK=m | 259 | CONFIG_ATALK=m |
233 | CONFIG_DEV_APPLETALK=m | 260 | CONFIG_DEV_APPLETALK=m |
234 | CONFIG_IPDDP=m | 261 | CONFIG_IPDDP=m |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 80ea4b4da872..d3cdb5447a2c 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -154,6 +154,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
154 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 154 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
155 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 155 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
156 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 156 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
157 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
157 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 158 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
158 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 159 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
159 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 160 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -233,12 +234,38 @@ CONFIG_IP6_NF_RAW=m | |||
233 | CONFIG_IP6_NF_NAT=m | 234 | CONFIG_IP6_NF_NAT=m |
234 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 235 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
235 | CONFIG_IP6_NF_TARGET_NPT=m | 236 | CONFIG_IP6_NF_TARGET_NPT=m |
237 | CONFIG_NF_TABLES_BRIDGE=m | ||
238 | CONFIG_NFT_BRIDGE_META=m | ||
239 | CONFIG_NFT_BRIDGE_REJECT=m | ||
240 | CONFIG_NF_LOG_BRIDGE=m | ||
241 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
242 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
243 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
244 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
245 | CONFIG_BRIDGE_EBT_802_3=m | ||
246 | CONFIG_BRIDGE_EBT_AMONG=m | ||
247 | CONFIG_BRIDGE_EBT_ARP=m | ||
248 | CONFIG_BRIDGE_EBT_IP=m | ||
249 | CONFIG_BRIDGE_EBT_IP6=m | ||
250 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
251 | CONFIG_BRIDGE_EBT_MARK=m | ||
252 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
253 | CONFIG_BRIDGE_EBT_STP=m | ||
254 | CONFIG_BRIDGE_EBT_VLAN=m | ||
255 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
256 | CONFIG_BRIDGE_EBT_DNAT=m | ||
257 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
258 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
259 | CONFIG_BRIDGE_EBT_SNAT=m | ||
260 | CONFIG_BRIDGE_EBT_LOG=m | ||
261 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
236 | CONFIG_IP_DCCP=m | 262 | CONFIG_IP_DCCP=m |
237 | # CONFIG_IP_DCCP_CCID3 is not set | 263 | # CONFIG_IP_DCCP_CCID3 is not set |
238 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 264 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
239 | CONFIG_RDS=m | 265 | CONFIG_RDS=m |
240 | CONFIG_RDS_TCP=m | 266 | CONFIG_RDS_TCP=m |
241 | CONFIG_L2TP=m | 267 | CONFIG_L2TP=m |
268 | CONFIG_BRIDGE=m | ||
242 | CONFIG_ATALK=m | 269 | CONFIG_ATALK=m |
243 | CONFIG_DEV_APPLETALK=m | 270 | CONFIG_DEV_APPLETALK=m |
244 | CONFIG_IPDDP=m | 271 | CONFIG_IPDDP=m |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index ab657e2a0199..b4c76640973e 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -142,6 +142,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
142 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 142 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
143 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 143 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
144 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 144 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
145 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
145 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 146 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
146 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 147 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
147 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 148 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -221,12 +222,38 @@ CONFIG_IP6_NF_RAW=m | |||
221 | CONFIG_IP6_NF_NAT=m | 222 | CONFIG_IP6_NF_NAT=m |
222 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 223 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
223 | CONFIG_IP6_NF_TARGET_NPT=m | 224 | CONFIG_IP6_NF_TARGET_NPT=m |
225 | CONFIG_NF_TABLES_BRIDGE=m | ||
226 | CONFIG_NFT_BRIDGE_META=m | ||
227 | CONFIG_NFT_BRIDGE_REJECT=m | ||
228 | CONFIG_NF_LOG_BRIDGE=m | ||
229 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
230 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
231 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
232 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
233 | CONFIG_BRIDGE_EBT_802_3=m | ||
234 | CONFIG_BRIDGE_EBT_AMONG=m | ||
235 | CONFIG_BRIDGE_EBT_ARP=m | ||
236 | CONFIG_BRIDGE_EBT_IP=m | ||
237 | CONFIG_BRIDGE_EBT_IP6=m | ||
238 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
239 | CONFIG_BRIDGE_EBT_MARK=m | ||
240 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
241 | CONFIG_BRIDGE_EBT_STP=m | ||
242 | CONFIG_BRIDGE_EBT_VLAN=m | ||
243 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
244 | CONFIG_BRIDGE_EBT_DNAT=m | ||
245 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
246 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
247 | CONFIG_BRIDGE_EBT_SNAT=m | ||
248 | CONFIG_BRIDGE_EBT_LOG=m | ||
249 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
224 | CONFIG_IP_DCCP=m | 250 | CONFIG_IP_DCCP=m |
225 | # CONFIG_IP_DCCP_CCID3 is not set | 251 | # CONFIG_IP_DCCP_CCID3 is not set |
226 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 252 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
227 | CONFIG_RDS=m | 253 | CONFIG_RDS=m |
228 | CONFIG_RDS_TCP=m | 254 | CONFIG_RDS_TCP=m |
229 | CONFIG_L2TP=m | 255 | CONFIG_L2TP=m |
256 | CONFIG_BRIDGE=m | ||
230 | CONFIG_ATALK=m | 257 | CONFIG_ATALK=m |
231 | CONFIG_6LOWPAN=m | 258 | CONFIG_6LOWPAN=m |
232 | CONFIG_DNS_RESOLVER=y | 259 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 7d232282e551..0d4a26f9b58c 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -143,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
143 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 143 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
144 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 144 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
145 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 145 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
146 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
146 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 147 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
147 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 148 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
148 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 149 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -222,12 +223,38 @@ CONFIG_IP6_NF_RAW=m | |||
222 | CONFIG_IP6_NF_NAT=m | 223 | CONFIG_IP6_NF_NAT=m |
223 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 224 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
224 | CONFIG_IP6_NF_TARGET_NPT=m | 225 | CONFIG_IP6_NF_TARGET_NPT=m |
226 | CONFIG_NF_TABLES_BRIDGE=m | ||
227 | CONFIG_NFT_BRIDGE_META=m | ||
228 | CONFIG_NFT_BRIDGE_REJECT=m | ||
229 | CONFIG_NF_LOG_BRIDGE=m | ||
230 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
231 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
232 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
233 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
234 | CONFIG_BRIDGE_EBT_802_3=m | ||
235 | CONFIG_BRIDGE_EBT_AMONG=m | ||
236 | CONFIG_BRIDGE_EBT_ARP=m | ||
237 | CONFIG_BRIDGE_EBT_IP=m | ||
238 | CONFIG_BRIDGE_EBT_IP6=m | ||
239 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
240 | CONFIG_BRIDGE_EBT_MARK=m | ||
241 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
242 | CONFIG_BRIDGE_EBT_STP=m | ||
243 | CONFIG_BRIDGE_EBT_VLAN=m | ||
244 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
245 | CONFIG_BRIDGE_EBT_DNAT=m | ||
246 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
247 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
248 | CONFIG_BRIDGE_EBT_SNAT=m | ||
249 | CONFIG_BRIDGE_EBT_LOG=m | ||
250 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
225 | CONFIG_IP_DCCP=m | 251 | CONFIG_IP_DCCP=m |
226 | # CONFIG_IP_DCCP_CCID3 is not set | 252 | # CONFIG_IP_DCCP_CCID3 is not set |
227 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 253 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
228 | CONFIG_RDS=m | 254 | CONFIG_RDS=m |
229 | CONFIG_RDS_TCP=m | 255 | CONFIG_RDS_TCP=m |
230 | CONFIG_L2TP=m | 256 | CONFIG_L2TP=m |
257 | CONFIG_BRIDGE=m | ||
231 | CONFIG_ATALK=m | 258 | CONFIG_ATALK=m |
232 | CONFIG_6LOWPAN=m | 259 | CONFIG_6LOWPAN=m |
233 | CONFIG_DNS_RESOLVER=y | 260 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 4aeedf893913..5d581c503fa3 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -143,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
143 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 143 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
144 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 144 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
145 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 145 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
146 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
146 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 147 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
147 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 148 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
148 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 149 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -222,12 +223,38 @@ CONFIG_IP6_NF_RAW=m | |||
222 | CONFIG_IP6_NF_NAT=m | 223 | CONFIG_IP6_NF_NAT=m |
223 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 224 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
224 | CONFIG_IP6_NF_TARGET_NPT=m | 225 | CONFIG_IP6_NF_TARGET_NPT=m |
226 | CONFIG_NF_TABLES_BRIDGE=m | ||
227 | CONFIG_NFT_BRIDGE_META=m | ||
228 | CONFIG_NFT_BRIDGE_REJECT=m | ||
229 | CONFIG_NF_LOG_BRIDGE=m | ||
230 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
231 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
232 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
233 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
234 | CONFIG_BRIDGE_EBT_802_3=m | ||
235 | CONFIG_BRIDGE_EBT_AMONG=m | ||
236 | CONFIG_BRIDGE_EBT_ARP=m | ||
237 | CONFIG_BRIDGE_EBT_IP=m | ||
238 | CONFIG_BRIDGE_EBT_IP6=m | ||
239 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
240 | CONFIG_BRIDGE_EBT_MARK=m | ||
241 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
242 | CONFIG_BRIDGE_EBT_STP=m | ||
243 | CONFIG_BRIDGE_EBT_VLAN=m | ||
244 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
245 | CONFIG_BRIDGE_EBT_DNAT=m | ||
246 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
247 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
248 | CONFIG_BRIDGE_EBT_SNAT=m | ||
249 | CONFIG_BRIDGE_EBT_LOG=m | ||
250 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
225 | CONFIG_IP_DCCP=m | 251 | CONFIG_IP_DCCP=m |
226 | # CONFIG_IP_DCCP_CCID3 is not set | 252 | # CONFIG_IP_DCCP_CCID3 is not set |
227 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 253 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
228 | CONFIG_RDS=m | 254 | CONFIG_RDS=m |
229 | CONFIG_RDS_TCP=m | 255 | CONFIG_RDS_TCP=m |
230 | CONFIG_L2TP=m | 256 | CONFIG_L2TP=m |
257 | CONFIG_BRIDGE=m | ||
231 | CONFIG_ATALK=m | 258 | CONFIG_ATALK=m |
232 | CONFIG_6LOWPAN=m | 259 | CONFIG_6LOWPAN=m |
233 | CONFIG_DNS_RESOLVER=y | 260 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index cfe2f268a6be..c6b49a4a887c 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -140,6 +140,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
140 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 140 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
141 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 141 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
142 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 142 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
143 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
143 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 144 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
144 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 145 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
145 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 146 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -219,12 +220,38 @@ CONFIG_IP6_NF_RAW=m | |||
219 | CONFIG_IP6_NF_NAT=m | 220 | CONFIG_IP6_NF_NAT=m |
220 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 221 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
221 | CONFIG_IP6_NF_TARGET_NPT=m | 222 | CONFIG_IP6_NF_TARGET_NPT=m |
223 | CONFIG_NF_TABLES_BRIDGE=m | ||
224 | CONFIG_NFT_BRIDGE_META=m | ||
225 | CONFIG_NFT_BRIDGE_REJECT=m | ||
226 | CONFIG_NF_LOG_BRIDGE=m | ||
227 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
228 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
229 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
230 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
231 | CONFIG_BRIDGE_EBT_802_3=m | ||
232 | CONFIG_BRIDGE_EBT_AMONG=m | ||
233 | CONFIG_BRIDGE_EBT_ARP=m | ||
234 | CONFIG_BRIDGE_EBT_IP=m | ||
235 | CONFIG_BRIDGE_EBT_IP6=m | ||
236 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
237 | CONFIG_BRIDGE_EBT_MARK=m | ||
238 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
239 | CONFIG_BRIDGE_EBT_STP=m | ||
240 | CONFIG_BRIDGE_EBT_VLAN=m | ||
241 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
242 | CONFIG_BRIDGE_EBT_DNAT=m | ||
243 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
244 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
245 | CONFIG_BRIDGE_EBT_SNAT=m | ||
246 | CONFIG_BRIDGE_EBT_LOG=m | ||
247 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
222 | CONFIG_IP_DCCP=m | 248 | CONFIG_IP_DCCP=m |
223 | # CONFIG_IP_DCCP_CCID3 is not set | 249 | # CONFIG_IP_DCCP_CCID3 is not set |
224 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 250 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
225 | CONFIG_RDS=m | 251 | CONFIG_RDS=m |
226 | CONFIG_RDS_TCP=m | 252 | CONFIG_RDS_TCP=m |
227 | CONFIG_L2TP=m | 253 | CONFIG_L2TP=m |
254 | CONFIG_BRIDGE=m | ||
228 | CONFIG_ATALK=m | 255 | CONFIG_ATALK=m |
229 | CONFIG_6LOWPAN=m | 256 | CONFIG_6LOWPAN=m |
230 | CONFIG_DNS_RESOLVER=y | 257 | CONFIG_DNS_RESOLVER=y |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index b867fd133bab..b65785eaff8d 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -140,6 +140,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m | |||
140 | CONFIG_NETFILTER_XT_MATCH_OSF=m | 140 | CONFIG_NETFILTER_XT_MATCH_OSF=m |
141 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 141 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
142 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 142 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
143 | CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m | ||
143 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 144 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
144 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 145 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m |
145 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | 146 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m |
@@ -219,12 +220,38 @@ CONFIG_IP6_NF_RAW=m | |||
219 | CONFIG_IP6_NF_NAT=m | 220 | CONFIG_IP6_NF_NAT=m |
220 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 221 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
221 | CONFIG_IP6_NF_TARGET_NPT=m | 222 | CONFIG_IP6_NF_TARGET_NPT=m |
223 | CONFIG_NF_TABLES_BRIDGE=m | ||
224 | CONFIG_NFT_BRIDGE_META=m | ||
225 | CONFIG_NFT_BRIDGE_REJECT=m | ||
226 | CONFIG_NF_LOG_BRIDGE=m | ||
227 | CONFIG_BRIDGE_NF_EBTABLES=m | ||
228 | CONFIG_BRIDGE_EBT_BROUTE=m | ||
229 | CONFIG_BRIDGE_EBT_T_FILTER=m | ||
230 | CONFIG_BRIDGE_EBT_T_NAT=m | ||
231 | CONFIG_BRIDGE_EBT_802_3=m | ||
232 | CONFIG_BRIDGE_EBT_AMONG=m | ||
233 | CONFIG_BRIDGE_EBT_ARP=m | ||
234 | CONFIG_BRIDGE_EBT_IP=m | ||
235 | CONFIG_BRIDGE_EBT_IP6=m | ||
236 | CONFIG_BRIDGE_EBT_LIMIT=m | ||
237 | CONFIG_BRIDGE_EBT_MARK=m | ||
238 | CONFIG_BRIDGE_EBT_PKTTYPE=m | ||
239 | CONFIG_BRIDGE_EBT_STP=m | ||
240 | CONFIG_BRIDGE_EBT_VLAN=m | ||
241 | CONFIG_BRIDGE_EBT_ARPREPLY=m | ||
242 | CONFIG_BRIDGE_EBT_DNAT=m | ||
243 | CONFIG_BRIDGE_EBT_MARK_T=m | ||
244 | CONFIG_BRIDGE_EBT_REDIRECT=m | ||
245 | CONFIG_BRIDGE_EBT_SNAT=m | ||
246 | CONFIG_BRIDGE_EBT_LOG=m | ||
247 | CONFIG_BRIDGE_EBT_NFLOG=m | ||
222 | CONFIG_IP_DCCP=m | 248 | CONFIG_IP_DCCP=m |
223 | # CONFIG_IP_DCCP_CCID3 is not set | 249 | # CONFIG_IP_DCCP_CCID3 is not set |
224 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 250 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
225 | CONFIG_RDS=m | 251 | CONFIG_RDS=m |
226 | CONFIG_RDS_TCP=m | 252 | CONFIG_RDS_TCP=m |
227 | CONFIG_L2TP=m | 253 | CONFIG_L2TP=m |
254 | CONFIG_BRIDGE=m | ||
228 | CONFIG_ATALK=m | 255 | CONFIG_ATALK=m |
229 | CONFIG_6LOWPAN=m | 256 | CONFIG_6LOWPAN=m |
230 | CONFIG_DNS_RESOLVER=y | 257 | CONFIG_DNS_RESOLVER=y |