* [PATCH nf-next] netfilter: nf_conntrack: remove unused code in nf_conntrack_proto_generic.c
@ 2017-08-28 9:52 Davide Caratti
2017-08-28 15:52 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Davide Caratti @ 2017-08-28 9:52 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
L4 protocol helpers for DCCP, SCTP and UDPlite can't be built as kernel
modules anymore, so we can remove code enclosed in
#ifdef CONFIG_NF_CT_PROTO_{DCCP,SCTP,UDPLITE}_MODULE
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
---
net/netfilter/nf_conntrack_proto_generic.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index 2bc3d0c1a5bf..2993995b690d 100644
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -17,22 +17,10 @@ static unsigned int nf_ct_generic_timeout __read_mostly = 600*HZ;
static bool nf_generic_should_process(u8 proto)
{
switch (proto) {
-#ifdef CONFIG_NF_CT_PROTO_SCTP_MODULE
- case IPPROTO_SCTP:
- return false;
-#endif
-#ifdef CONFIG_NF_CT_PROTO_DCCP_MODULE
- case IPPROTO_DCCP:
- return false;
-#endif
#ifdef CONFIG_NF_CT_PROTO_GRE_MODULE
case IPPROTO_GRE:
return false;
#endif
-#ifdef CONFIG_NF_CT_PROTO_UDPLITE_MODULE
- case IPPROTO_UDPLITE:
- return false;
-#endif
default:
return true;
}
--
2.13.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf-next] netfilter: nf_conntrack: remove unused code in nf_conntrack_proto_generic.c
2017-08-28 9:52 [PATCH nf-next] netfilter: nf_conntrack: remove unused code in nf_conntrack_proto_generic.c Davide Caratti
@ 2017-08-28 15:52 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-08-28 15:52 UTC (permalink / raw)
To: Davide Caratti; +Cc: netfilter-devel
On Mon, Aug 28, 2017 at 11:52:07AM +0200, Davide Caratti wrote:
> L4 protocol helpers for DCCP, SCTP and UDPlite can't be built as kernel
> modules anymore, so we can remove code enclosed in
> #ifdef CONFIG_NF_CT_PROTO_{DCCP,SCTP,UDPLITE}_MODULE
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-28 15:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-28 9:52 [PATCH nf-next] netfilter: nf_conntrack: remove unused code in nf_conntrack_proto_generic.c Davide Caratti
2017-08-28 15:52 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).