{"id":809455,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809455/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478625-13330-1-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504478625-13330-1-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:43:44","name":"[46/47] netfilter: conntrack: remove unused code in nf_conntrack_proto_generic.c","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3f7c8d67c32b09ee3b669f4cdd0e647e411b4a8f","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/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/1504478625-13330-1-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1282,"url":"http://patchwork.ozlabs.org/api/1.2/series/1282/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1282","date":"2017-09-03T22:40:11","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/1282/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809455/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809455/checks/","tags":{},"related":[],"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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlp1k2BsBz9s06\n\tfor ;\n\tMon, 4 Sep 2017 08:44:10 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753056AbdICWn7 (ORCPT );\n\tSun, 3 Sep 2017 18:43:59 -0400","from mail.us.es ([193.147.175.20]:53216 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753359AbdICWn4 (ORCPT );\n\tSun, 3 Sep 2017 18:43:56 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id E1326190F62\n\tfor ;\n\tMon, 4 Sep 2017 00:43:29 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id D436F2DC84\n\tfor ;\n\tMon, 4 Sep 2017 00:43:29 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid CA0A1CE372; Mon, 4 Sep 2017 00:43:29 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id C125AB5024;\n\tMon, 4 Sep 2017 00:43:27 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:43:27 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 6FE2C4265A20;\n\tMon, 4 Sep 2017 00:43:24 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 46/47] netfilter: conntrack: remove unused code in\n\tnf_conntrack_proto_generic.c","Date":"Mon, 4 Sep 2017 00:43:44 +0200","Message-Id":"<1504478625-13330-1-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Davide Caratti \n\nL4 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 \nSigned-off-by: Pablo Neira Ayuso \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":["46/47"]}