{"id":809445,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809445/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504478574-13281-10-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":"<1504478574-13281-10-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:42:52","name":"[45/47] netfilter: Remove NFDEBUG()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"edb0701dbb066def226818364ae020d1608dc423","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/1504478574-13281-10-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/809445/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809445/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 3xlp0w6pwtz9s8J\n\tfor ;\n\tMon, 4 Sep 2017 08:43:28 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753414AbdICWnW (ORCPT );\n\tSun, 3 Sep 2017 18:43:22 -0400","from mail.us.es ([193.147.175.20]:53090 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753497AbdICWnP (ORCPT );\n\tSun, 3 Sep 2017 18:43:15 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id D57C0190F6F\n\tfor ;\n\tMon, 4 Sep 2017 00:42:48 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id C7412B502D\n\tfor ;\n\tMon, 4 Sep 2017 00:42:48 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid B978EB5056; Mon, 4 Sep 2017 00:42:48 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id B8970DA2AF;\n\tMon, 4 Sep 2017 00:42:46 +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:42:46 +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 7115E4265A20;\n\tMon, 4 Sep 2017 00:42:46 +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 45/47] netfilter: Remove NFDEBUG()","Date":"Mon, 4 Sep 2017 00:42:52 +0200","Message-Id":"<1504478574-13281-10-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504478574-13281-1-git-send-email-pablo@netfilter.org>","References":"<1504478574-13281-1-git-send-email-pablo@netfilter.org>","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: Varsha Rao \n\nRemove NFDEBUG and use pr_debug() instead of it.\n\nSigned-off-by: Varsha Rao \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_internals.h | 6 ------\n net/netfilter/nf_sockopt.c | 2 +-\n 2 files changed, 1 insertion(+), 7 deletions(-)","diff":"diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h\nindex bacd6363946e..49f87ec093a3 100644\n--- a/net/netfilter/nf_internals.h\n+++ b/net/netfilter/nf_internals.h\n@@ -5,12 +5,6 @@\n #include \n #include \n \n-#ifdef CONFIG_NETFILTER_DEBUG\n-#define NFDEBUG(format, args...) printk(KERN_DEBUG format , ## args)\n-#else\n-#define NFDEBUG(format, args...)\n-#endif\n-\n /* nf_queue.c */\n int nf_queue(struct sk_buff *skb, struct nf_hook_state *state,\n \t const struct nf_hook_entries *entries, unsigned int index,\ndiff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c\nindex c68c1e58b362..d2a9e6b5d01f 100644\n--- a/net/netfilter/nf_sockopt.c\n+++ b/net/netfilter/nf_sockopt.c\n@@ -33,7 +33,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)\n \t\t\t\treg->set_optmin, reg->set_optmax)\n \t\t\t|| overlap(ops->get_optmin, ops->get_optmax,\n \t\t\t\t reg->get_optmin, reg->get_optmax))) {\n-\t\t\tNFDEBUG(\"nf_sock overlap: %u-%u/%u-%u v %u-%u/%u-%u\\n\",\n+\t\t\tpr_debug(\"nf_sock overlap: %u-%u/%u-%u v %u-%u/%u-%u\\n\",\n \t\t\t\tops->set_optmin, ops->set_optmax,\n \t\t\t\tops->get_optmin, ops->get_optmax,\n \t\t\t\treg->set_optmin, reg->set_optmax,\n","prefixes":["45/47"]}