[PATCH 46/47] netfilter: conntrack: remove unused code in nf_conntrack_proto_generic.c

[Pablo Neira Ayuso]

From: Davide Caratti <dcara...@redhat.com>

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 <dcara...@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
---
 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.1.4


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html