From 38bb1eab7bbbaeb5370b5450ff131200fb9d37ad Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 13 May 2010 15:00:20 +0200
Subject: [PATCH] --- yaml --- r: 195071 b: refs/heads/master c:
 af5676039a9479e6ff42c6aab9fac1149ac9597f h: refs/heads/master i:   195069:
 051b259ef06970815c2fd063f1eed74135e4e09b   195067:
 08b99cfbe188e027de56defc9d61fe52e77622ea   195063:
 ed076616616085dc3b8716f48ca3c3e5fff650c1   195055:
 b466331beaff539a50e561995a5729c044fdd613   195039:
 14570a2290cd23874fc30df0189546331c1455c1   195007:
 67ec2b150af55b8497437cebdbcc54621e03de2f   194943:
 dd0cb9504d6c126491ea65da15fd8093c5018ef1   194815:
 d885444ff3ced5e9e018af35595a9d41f0d367e9   194559:
 d61d5ef064409d30670291ba5c4ac2b1d22636bb v: v3

---
 [refs]                                | 2 +-
 trunk/net/ipv4/netfilter/arp_tables.c | 7 +------
 trunk/net/ipv4/netfilter/ip_tables.c  | 7 +------
 trunk/net/ipv6/netfilter/ip6_tables.c | 7 +------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index d0f885990854..1503720d6dc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e94c67436efa22af7d8b7d19c885863246042543
+refs/heads/master: af5676039a9479e6ff42c6aab9fac1149ac9597f
diff --git a/trunk/net/ipv4/netfilter/arp_tables.c b/trunk/net/ipv4/netfilter/arp_tables.c
index 03352fcba172..65f2944b5a64 100644
--- a/trunk/net/ipv4/netfilter/arp_tables.c
+++ b/trunk/net/ipv4/netfilter/arp_tables.c
@@ -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
diff --git a/trunk/net/ipv4/netfilter/ip_tables.c b/trunk/net/ipv4/netfilter/ip_tables.c
index 49b9e4fb5460..ad702bc34e75 100644
--- a/trunk/net/ipv4/netfilter/ip_tables.c
+++ b/trunk/net/ipv4/netfilter/ip_tables.c
@@ -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
diff --git a/trunk/net/ipv6/netfilter/ip6_tables.c b/trunk/net/ipv6/netfilter/ip6_tables.c
index 56782336474f..02a7db025d0f 100644
--- a/trunk/net/ipv6/netfilter/ip6_tables.c
+++ b/trunk/net/ipv6/netfilter/ip6_tables.c
@@ -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