{"id":806466,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806466/?format=json","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.0/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<2506ca6f6d8fdc51d85fc77e558b1662ff18eba9.1503913723.git.dcaratti@redhat.com>","date":"2017-08-28T09:52:07","name":"[nf-next] netfilter: nf_conntrack: remove unused code in nf_conntrack_proto_generic.c","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3f7c8d67c32b09ee3b669f4cdd0e647e411b4a8f","submitter":{"id":69455,"url":"http://patchwork.ozlabs.org/api/1.0/people/69455/?format=json","name":"Davide Caratti","email":"dcaratti@redhat.com"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.0/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/2506ca6f6d8fdc51d85fc77e558b1662ff18eba9.1503913723.git.dcaratti@redhat.com/mbox/","series":[{"id":121,"url":"http://patchwork.ozlabs.org/api/1.0/series/121/?format=json","date":"2017-08-28T09:52:07","name":"[nf-next] netfilter: nf_conntrack: remove unused code in nf_conntrack_proto_generic.c","version":1,"mbox":"http://patchwork.ozlabs.org/series/121/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806466/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=dcaratti@redhat.com"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgn9m2dMLz9sNc\n\tfor ;\n\tMon, 28 Aug 2017 19:52:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751172AbdH1JwL (ORCPT );\n\tMon, 28 Aug 2017 05:52:11 -0400","from mx1.redhat.com ([209.132.183.28]:50514 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751143AbdH1JwK (ORCPT );\n\tMon, 28 Aug 2017 05:52:10 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 9C1575D68D;\n\tMon, 28 Aug 2017 09:52:10 +0000 (UTC)","from localhost.mxp.redhat.com (unknown [10.32.181.230])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E2D917F794;\n\tMon, 28 Aug 2017 09:52:09 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 9C1575D68D","From":"Davide Caratti ","To":"Pablo Neira Ayuso ","Cc":"netfilter-devel@vger.kernel.org","Subject":"[PATCH nf-next] netfilter: nf_conntrack: remove unused code in\n\tnf_conntrack_proto_generic.c","Date":"Mon, 28 Aug 2017 11:52:07 +0200","Message-Id":"<2506ca6f6d8fdc51d85fc77e558b1662ff18eba9.1503913723.git.dcaratti@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tMon, 28 Aug 2017 09:52:10 +0000 (UTC)","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"L4 protocol helpers for DCCP, SCTP and UDPlite can't be built as kernel\nmodules anymore, so we can remove code enclosed in\n #ifdef CONFIG_NF_CT_PROTO_{DCCP,SCTP,UDPLITE}_MODULE\n\nSigned-off-by: Davide Caratti \n---\n net/netfilter/nf_conntrack_proto_generic.c | 12 ------------\n 1 file changed, 12 deletions(-)","diff":"diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c\nindex 2bc3d0c1a5bf..2993995b690d 100644\n--- a/net/netfilter/nf_conntrack_proto_generic.c\n+++ b/net/netfilter/nf_conntrack_proto_generic.c\n@@ -17,22 +17,10 @@ static unsigned int nf_ct_generic_timeout __read_mostly = 600*HZ;\n static bool nf_generic_should_process(u8 proto)\n {\n \tswitch (proto) {\n-#ifdef CONFIG_NF_CT_PROTO_SCTP_MODULE\n-\tcase IPPROTO_SCTP:\n-\t\treturn false;\n-#endif\n-#ifdef CONFIG_NF_CT_PROTO_DCCP_MODULE\n-\tcase IPPROTO_DCCP:\n-\t\treturn false;\n-#endif\n #ifdef CONFIG_NF_CT_PROTO_GRE_MODULE\n \tcase IPPROTO_GRE:\n \t\treturn false;\n #endif\n-#ifdef CONFIG_NF_CT_PROTO_UDPLITE_MODULE\n-\tcase IPPROTO_UDPLITE:\n-\t\treturn false;\n-#endif\n \tdefault:\n \t\treturn true;\n \t}\n","prefixes":["nf-next"]}