Commit 9efdb14f authored by Varsha Rao's avatar Varsha Rao Committed by Pablo Neira Ayuso
Browse files

net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros. 



This patch removes CONFIG_NETFILTER_DEBUG and _ASSERT() macros as they
are no longer required. Replace _ASSERT() macros with WARN_ON().

Signed-off-by: default avatarVarsha Rao <rvarsha016@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 44d6e2f2

arch/parisc/configs/c3000_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_TUNNEL=m

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_NET_PKTGEN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

arch/sh/configs/se7751_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_IP_NF_QUEUE=y

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

include/net/netfilter/nf_conntrack.h

+0 −6
Original line number Diff line number Diff line
@@ -44,12 +44,6 @@ union nf_conntrack_expect_proto { 
#include <linux/types.h>

#include <linux/skbuff.h>



#ifdef CONFIG_NETFILTER_DEBUG

#define NF_CT_ASSERT(x)		WARN_ON(!(x))

#else

#define NF_CT_ASSERT(x)

#endif



#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>

#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>

net/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -166,13 +166,6 @@ menuconfig NETFILTER 


if NETFILTER



config NETFILTER_DEBUG

	bool "Network packet filtering debugging"

	depends on NETFILTER

	help

	  You can say Y here if you want to get additional messages useful in

	  debugging the netfilter code.



config NETFILTER_ADVANCED

	bool "Advanced netfilter configuration"

	depends on NETFILTER

net/bridge/netfilter/ebtables.c

+8 −12
Original line number Diff line number Diff line
@@ -252,13 +252,11 @@ unsigned int ebt_do_table(struct sk_buff *skb, 
		}

		if (verdict == EBT_RETURN) {

letsreturn:

#ifdef CONFIG_NETFILTER_DEBUG

			if (sp == 0) {

				BUGPRINT("RETURN on base chain");

			if (WARN(sp == 0, "RETURN on base chain")) {

				/* act like this is EBT_CONTINUE */

				goto letscontinue;

			}

#endif



			sp--;

			/* put all the local variables right */

			i = cs[sp].n;
@@ -271,26 +269,24 @@ unsigned int ebt_do_table(struct sk_buff *skb, 
		}

		if (verdict == EBT_CONTINUE)

			goto letscontinue;

#ifdef CONFIG_NETFILTER_DEBUG

		if (verdict < 0) {

			BUGPRINT("bogus standard verdict\n");



		if (WARN(verdict < 0, "bogus standard verdict\n")) {

			read_unlock_bh(&table->lock);

			return NF_DROP;

		}

#endif



		/* jump to a udc */

		cs[sp].n = i + 1;

		cs[sp].chaininfo = chaininfo;

		cs[sp].e = ebt_next_entry(point);

		i = 0;

		chaininfo = (struct ebt_entries *) (base + verdict);

#ifdef CONFIG_NETFILTER_DEBUG

		if (chaininfo->distinguisher) {

			BUGPRINT("jump to non-chain\n");



		if (WARN(chaininfo->distinguisher, "jump to non-chain\n")) {

			read_unlock_bh(&table->lock);

			return NF_DROP;

		}

#endif



		nentries = chaininfo->nentries;

		point = (struct ebt_entry *)chaininfo->data;

		counter_base = cb_base + chaininfo->counter_offset;