aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-03-16 00:04:32 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-03-23 18:48:35 -0400
commite45fbae51553a57cb591abf24398ed79ecbf8923 (patch)
tree0f525620cc163666e94ef80fff4d9a2bcadaab61
parent1907a2c2c33267c454c6e7a6f6e6c5e01840b0ec (diff)
powerpc: Use default set of netfilter modules (CONFIG_NETFILTER_ADVANCED=n)
Our netfilter options are stale and important things like masquerading are no longer enabled. Instead of trying to keep up with any updates, set CONFIG_NETFILTER_ADVANCED=n on ppc64* and pseries* defconfigs. This enables the most common netfilter modules for us. While here, enable the network bridge module which is heavily used in KVM setups. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat
-rw-r--r--arch/powerpc/configs/ppc64_defconfig70
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig70
-rw-r--r--arch/powerpc/configs/pseries_defconfig53
-rw-r--r--arch/powerpc/configs/pseries_le_defconfig53
4 files changed, 8 insertions, 238 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index e015896b7e5c..f26b267eb71f 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -73,74 +73,8 @@ CONFIG_INET_ESP=m
73CONFIG_INET_IPCOMP=m 73CONFIG_INET_IPCOMP=m
74# CONFIG_IPV6 is not set 74# CONFIG_IPV6 is not set
75CONFIG_NETFILTER=y 75CONFIG_NETFILTER=y
76CONFIG_NF_CONNTRACK=m 76# CONFIG_NETFILTER_ADVANCED is not set
77CONFIG_NF_CONNTRACK_EVENTS=y 77CONFIG_BRIDGE=m
78CONFIG_NF_CT_PROTO_SCTP=m
79CONFIG_NF_CONNTRACK_AMANDA=m
80CONFIG_NF_CONNTRACK_FTP=m
81CONFIG_NF_CONNTRACK_H323=m
82CONFIG_NF_CONNTRACK_IRC=m
83CONFIG_NF_CONNTRACK_NETBIOS_NS=m
84CONFIG_NF_CONNTRACK_PPTP=m
85CONFIG_NF_CONNTRACK_SIP=m
86CONFIG_NF_CONNTRACK_TFTP=m
87CONFIG_NF_CT_NETLINK=m
88CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
89CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
90CONFIG_NETFILTER_XT_TARGET_DSCP=m
91CONFIG_NETFILTER_XT_TARGET_MARK=m
92CONFIG_NETFILTER_XT_TARGET_NFLOG=m
93CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
94CONFIG_NETFILTER_XT_TARGET_TPROXY=m
95CONFIG_NETFILTER_XT_TARGET_TRACE=m
96CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
97CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
98CONFIG_NETFILTER_XT_MATCH_COMMENT=m
99CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
100CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
101CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
102CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
103CONFIG_NETFILTER_XT_MATCH_DCCP=m
104CONFIG_NETFILTER_XT_MATCH_DSCP=m
105CONFIG_NETFILTER_XT_MATCH_ESP=m
106CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
107CONFIG_NETFILTER_XT_MATCH_HELPER=m
108CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
109CONFIG_NETFILTER_XT_MATCH_LENGTH=m
110CONFIG_NETFILTER_XT_MATCH_LIMIT=m
111CONFIG_NETFILTER_XT_MATCH_MAC=m
112CONFIG_NETFILTER_XT_MATCH_MARK=m
113CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
114CONFIG_NETFILTER_XT_MATCH_OWNER=m
115CONFIG_NETFILTER_XT_MATCH_POLICY=m
116CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
117CONFIG_NETFILTER_XT_MATCH_QUOTA=m
118CONFIG_NETFILTER_XT_MATCH_RATEEST=m
119CONFIG_NETFILTER_XT_MATCH_REALM=m
120CONFIG_NETFILTER_XT_MATCH_RECENT=m
121CONFIG_NETFILTER_XT_MATCH_SCTP=m
122CONFIG_NETFILTER_XT_MATCH_SOCKET=m
123CONFIG_NETFILTER_XT_MATCH_STATE=m
124CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
125CONFIG_NETFILTER_XT_MATCH_STRING=m
126CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
127CONFIG_NETFILTER_XT_MATCH_U32=m
128CONFIG_NF_CONNTRACK_IPV4=m
129CONFIG_IP_NF_IPTABLES=m
130CONFIG_IP_NF_MATCH_AH=m
131CONFIG_IP_NF_MATCH_ECN=m
132CONFIG_IP_NF_MATCH_TTL=m
133CONFIG_IP_NF_FILTER=m
134CONFIG_IP_NF_TARGET_REJECT=m
135CONFIG_IP_NF_TARGET_ULOG=m
136CONFIG_IP_NF_MANGLE=m
137CONFIG_IP_NF_TARGET_CLUSTERIP=m
138CONFIG_IP_NF_TARGET_ECN=m
139CONFIG_IP_NF_TARGET_TTL=m
140CONFIG_IP_NF_RAW=m
141CONFIG_IP_NF_ARPTABLES=m
142CONFIG_IP_NF_ARPFILTER=m
143CONFIG_IP_NF_ARP_MANGLE=m
144CONFIG_BPF_JIT=y 78CONFIG_BPF_JIT=y
145CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 79CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
146CONFIG_DEVTMPFS=y 80CONFIG_DEVTMPFS=y
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index f627fda08953..438e813dc9cb 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -48,74 +48,8 @@ CONFIG_INET_ESP=m
48CONFIG_INET_IPCOMP=m 48CONFIG_INET_IPCOMP=m
49# CONFIG_IPV6 is not set 49# CONFIG_IPV6 is not set
50CONFIG_NETFILTER=y 50CONFIG_NETFILTER=y
51CONFIG_NF_CONNTRACK=m 51# CONFIG_NETFILTER_ADVANCED is not set
52CONFIG_NF_CONNTRACK_EVENTS=y 52CONFIG_BRIDGE=m
53CONFIG_NF_CT_PROTO_SCTP=m
54CONFIG_NF_CONNTRACK_AMANDA=m
55CONFIG_NF_CONNTRACK_FTP=m
56CONFIG_NF_CONNTRACK_H323=m
57CONFIG_NF_CONNTRACK_IRC=m
58CONFIG_NF_CONNTRACK_NETBIOS_NS=m
59CONFIG_NF_CONNTRACK_PPTP=m
60CONFIG_NF_CONNTRACK_SIP=m
61CONFIG_NF_CONNTRACK_TFTP=m
62CONFIG_NF_CT_NETLINK=m
63CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
64CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
65CONFIG_NETFILTER_XT_TARGET_DSCP=m
66CONFIG_NETFILTER_XT_TARGET_MARK=m
67CONFIG_NETFILTER_XT_TARGET_NFLOG=m
68CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
69CONFIG_NETFILTER_XT_TARGET_TPROXY=m
70CONFIG_NETFILTER_XT_TARGET_TRACE=m
71CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
72CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
73CONFIG_NETFILTER_XT_MATCH_COMMENT=m
74CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
75CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
76CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
77CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
78CONFIG_NETFILTER_XT_MATCH_DCCP=m
79CONFIG_NETFILTER_XT_MATCH_DSCP=m
80CONFIG_NETFILTER_XT_MATCH_ESP=m
81CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
82CONFIG_NETFILTER_XT_MATCH_HELPER=m
83CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
84CONFIG_NETFILTER_XT_MATCH_LENGTH=m
85CONFIG_NETFILTER_XT_MATCH_LIMIT=m
86CONFIG_NETFILTER_XT_MATCH_MAC=m
87CONFIG_NETFILTER_XT_MATCH_MARK=m
88CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
89CONFIG_NETFILTER_XT_MATCH_OWNER=m
90CONFIG_NETFILTER_XT_MATCH_POLICY=m
91CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
92CONFIG_NETFILTER_XT_MATCH_QUOTA=m
93CONFIG_NETFILTER_XT_MATCH_RATEEST=m
94CONFIG_NETFILTER_XT_MATCH_REALM=m
95CONFIG_NETFILTER_XT_MATCH_RECENT=m
96CONFIG_NETFILTER_XT_MATCH_SCTP=m
97CONFIG_NETFILTER_XT_MATCH_SOCKET=m
98CONFIG_NETFILTER_XT_MATCH_STATE=m
99CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
100CONFIG_NETFILTER_XT_MATCH_STRING=m
101CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
102CONFIG_NETFILTER_XT_MATCH_U32=m
103CONFIG_NF_CONNTRACK_IPV4=m
104CONFIG_IP_NF_IPTABLES=m
105CONFIG_IP_NF_MATCH_AH=m
106CONFIG_IP_NF_MATCH_ECN=m
107CONFIG_IP_NF_MATCH_TTL=m
108CONFIG_IP_NF_FILTER=m
109CONFIG_IP_NF_TARGET_REJECT=m
110CONFIG_IP_NF_TARGET_ULOG=m
111CONFIG_IP_NF_MANGLE=m
112CONFIG_IP_NF_TARGET_CLUSTERIP=m
113CONFIG_IP_NF_TARGET_ECN=m
114CONFIG_IP_NF_TARGET_TTL=m
115CONFIG_IP_NF_RAW=m
116CONFIG_IP_NF_ARPTABLES=m
117CONFIG_IP_NF_ARPFILTER=m
118CONFIG_IP_NF_ARP_MANGLE=m
119CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
120CONFIG_DEVTMPFS=y 54CONFIG_DEVTMPFS=y
121CONFIG_DEVTMPFS_MOUNT=y 55CONFIG_DEVTMPFS_MOUNT=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 82cf3f8721b9..9ea8342bd219 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -65,57 +65,8 @@ CONFIG_INET_ESP=m
65CONFIG_INET_IPCOMP=m 65CONFIG_INET_IPCOMP=m
66# CONFIG_IPV6 is not set 66# CONFIG_IPV6 is not set
67CONFIG_NETFILTER=y 67CONFIG_NETFILTER=y
68CONFIG_NF_CONNTRACK=m 68# CONFIG_NETFILTER_ADVANCED is not set
69CONFIG_NF_CONNTRACK_EVENTS=y 69CONFIG_BRIDGE=m
70CONFIG_NF_CT_PROTO_UDPLITE=m
71CONFIG_NF_CONNTRACK_FTP=m
72CONFIG_NF_CONNTRACK_IRC=m
73CONFIG_NF_CONNTRACK_TFTP=m
74CONFIG_NF_CT_NETLINK=m
75CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
76CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
77CONFIG_NETFILTER_XT_TARGET_MARK=m
78CONFIG_NETFILTER_XT_TARGET_NFLOG=m
79CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
80CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
81CONFIG_NETFILTER_XT_MATCH_COMMENT=m
82CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
83CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
84CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
85CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
86CONFIG_NETFILTER_XT_MATCH_DCCP=m
87CONFIG_NETFILTER_XT_MATCH_DSCP=m
88CONFIG_NETFILTER_XT_MATCH_ESP=m
89CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
90CONFIG_NETFILTER_XT_MATCH_HELPER=m
91CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
92CONFIG_NETFILTER_XT_MATCH_LENGTH=m
93CONFIG_NETFILTER_XT_MATCH_LIMIT=m
94CONFIG_NETFILTER_XT_MATCH_MAC=m
95CONFIG_NETFILTER_XT_MATCH_MARK=m
96CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
97CONFIG_NETFILTER_XT_MATCH_OWNER=m
98CONFIG_NETFILTER_XT_MATCH_POLICY=m
99CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
100CONFIG_NETFILTER_XT_MATCH_QUOTA=m
101CONFIG_NETFILTER_XT_MATCH_RATEEST=m
102CONFIG_NETFILTER_XT_MATCH_REALM=m
103CONFIG_NETFILTER_XT_MATCH_RECENT=m
104CONFIG_NETFILTER_XT_MATCH_SCTP=m
105CONFIG_NETFILTER_XT_MATCH_STATE=m
106CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
107CONFIG_NETFILTER_XT_MATCH_STRING=m
108CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
109CONFIG_NETFILTER_XT_MATCH_TIME=m
110CONFIG_NETFILTER_XT_MATCH_U32=m
111CONFIG_NF_CONNTRACK_IPV4=m
112CONFIG_IP_NF_IPTABLES=m
113CONFIG_IP_NF_MATCH_AH=m
114CONFIG_IP_NF_MATCH_ECN=m
115CONFIG_IP_NF_MATCH_TTL=m
116CONFIG_IP_NF_FILTER=m
117CONFIG_IP_NF_TARGET_REJECT=m
118CONFIG_IP_NF_TARGET_ULOG=m
119CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
120CONFIG_DEVTMPFS=y 71CONFIG_DEVTMPFS=y
121CONFIG_DEVTMPFS_MOUNT=y 72CONFIG_DEVTMPFS_MOUNT=y
diff --git a/arch/powerpc/configs/pseries_le_defconfig b/arch/powerpc/configs/pseries_le_defconfig
index 62771e0adb7c..3c84f9d87980 100644
--- a/arch/powerpc/configs/pseries_le_defconfig
+++ b/arch/powerpc/configs/pseries_le_defconfig
@@ -67,57 +67,8 @@ CONFIG_INET_ESP=m
67CONFIG_INET_IPCOMP=m 67CONFIG_INET_IPCOMP=m
68# CONFIG_IPV6 is not set 68# CONFIG_IPV6 is not set
69CONFIG_NETFILTER=y 69CONFIG_NETFILTER=y
70CONFIG_NF_CONNTRACK=m 70# CONFIG_NETFILTER_ADVANCED is not set
71CONFIG_NF_CONNTRACK_EVENTS=y 71CONFIG_BRIDGE=m
72CONFIG_NF_CT_PROTO_UDPLITE=m
73CONFIG_NF_CONNTRACK_FTP=m
74CONFIG_NF_CONNTRACK_IRC=m
75CONFIG_NF_CONNTRACK_TFTP=m
76CONFIG_NF_CT_NETLINK=m
77CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
78CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
79CONFIG_NETFILTER_XT_TARGET_MARK=m
80CONFIG_NETFILTER_XT_TARGET_NFLOG=m
81CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
82CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
83CONFIG_NETFILTER_XT_MATCH_COMMENT=m
84CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
85CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
86CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
87CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
88CONFIG_NETFILTER_XT_MATCH_DCCP=m
89CONFIG_NETFILTER_XT_MATCH_DSCP=m
90CONFIG_NETFILTER_XT_MATCH_ESP=m
91CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
92CONFIG_NETFILTER_XT_MATCH_HELPER=m
93CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
94CONFIG_NETFILTER_XT_MATCH_LENGTH=m
95CONFIG_NETFILTER_XT_MATCH_LIMIT=m
96CONFIG_NETFILTER_XT_MATCH_MAC=m
97CONFIG_NETFILTER_XT_MATCH_MARK=m
98CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
99CONFIG_NETFILTER_XT_MATCH_OWNER=m
100CONFIG_NETFILTER_XT_MATCH_POLICY=m
101CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
102CONFIG_NETFILTER_XT_MATCH_QUOTA=m
103CONFIG_NETFILTER_XT_MATCH_RATEEST=m
104CONFIG_NETFILTER_XT_MATCH_REALM=m
105CONFIG_NETFILTER_XT_MATCH_RECENT=m
106CONFIG_NETFILTER_XT_MATCH_SCTP=m
107CONFIG_NETFILTER_XT_MATCH_STATE=m
108CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
109CONFIG_NETFILTER_XT_MATCH_STRING=m
110CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
111CONFIG_NETFILTER_XT_MATCH_TIME=m
112CONFIG_NETFILTER_XT_MATCH_U32=m
113CONFIG_NF_CONNTRACK_IPV4=m
114CONFIG_IP_NF_IPTABLES=m
115CONFIG_IP_NF_MATCH_AH=m
116CONFIG_IP_NF_MATCH_ECN=m
117CONFIG_IP_NF_MATCH_TTL=m
118CONFIG_IP_NF_FILTER=m
119CONFIG_IP_NF_TARGET_REJECT=m
120CONFIG_IP_NF_TARGET_ULOG=m
121CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 72CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
122CONFIG_DEVTMPFS=y 73CONFIG_DEVTMPFS=y
123CONFIG_DEVTMPFS_MOUNT=y 74CONFIG_DEVTMPFS_MOUNT=y
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-30 17:00:31 -0400