diff options
| author | Davide Caratti <dcaratti@redhat.com> | 2017-08-28 11:52:07 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-08-28 18:14:29 +0200 |
| commit | d11dd6cdc3883f3c74f841f4d40dfe57c0b9756c (patch) | |
| tree | 5df036f9f7f0dc9206b220d323f22997f77734c3 /net/netfilter | |
| parent | b38cf90133e5b86c26633c1041c2cdc7360cb346 (diff) | |
| download | linux-stable-d11dd6cdc3883f3c74f841f4d40dfe57c0b9756c.tar.gz linux-stable-d11dd6cdc3883f3c74f841f4d40dfe57c0b9756c.tar.bz2 linux-stable-d11dd6cdc3883f3c74f841f4d40dfe57c0b9756c.zip | |
netfilter: conntrack: remove unused code in nf_conntrack_proto_generic.c
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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_generic.c | 12 |
1 files changed, 0 insertions, 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; } |