Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af567603 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Patrick McHardy
Browse files

netfilter: change NF_ASSERT to WARN_ON 



Change netfilter asserts to standard WARN_ON. This has the
benefit of backtrace info and also causes netfilter errors
to show up on kerneloops.org.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent e94c6743

net/ipv4/netfilter/arp_tables.c

+1 −6
Original line number Diff line number Diff line
@@ -49,12 +49,7 @@ MODULE_DESCRIPTION("arptables core"); 
#endif



#ifdef CONFIG_NETFILTER_DEBUG

#define ARP_NF_ASSERT(x)					\

do {								\

	if (!(x))						\

		printk("ARP_NF_ASSERT: %s:%s:%u\n",		\

		       __func__, __FILE__, __LINE__);	\

} while(0)

#define ARP_NF_ASSERT(x)	WARN_ON(!(x))

#else

#define ARP_NF_ASSERT(x)

#endif

net/ipv4/netfilter/ip_tables.c

+1 −6
Original line number Diff line number Diff line
@@ -51,12 +51,7 @@ MODULE_DESCRIPTION("IPv4 packet filter"); 
#endif



#ifdef CONFIG_NETFILTER_DEBUG

#define IP_NF_ASSERT(x)						\

do {								\

	if (!(x))						\

		printk("IP_NF_ASSERT: %s:%s:%u\n",		\

		       __func__, __FILE__, __LINE__);	\

} while(0)

#define IP_NF_ASSERT(x)		WARN_ON(!(x))

#else

#define IP_NF_ASSERT(x)

#endif

net/ipv6/netfilter/ip6_tables.c

+1 −6
Original line number Diff line number Diff line
@@ -52,12 +52,7 @@ MODULE_DESCRIPTION("IPv6 packet filter"); 
#endif



#ifdef CONFIG_NETFILTER_DEBUG

#define IP_NF_ASSERT(x)						\

do {								\

	if (!(x))						\

		printk("IP_NF_ASSERT: %s:%s:%u\n",		\

		       __func__, __FILE__, __LINE__);	\

} while(0)

#define IP_NF_ASSERT(x)	WARN_ON(!(x))

#else

#define IP_NF_ASSERT(x)

#endif