Home » Mailing list archives » linux-netdev » 2009 » March » 10

Re: [PATCH 03/25] [net] BUG to BUG_ON changes

Previous thread: [PATCH] net: fix warning about non-const string by Stephen Hemminger on Monday, March 9, 2009 - 4:51 pm. (1 message)

Next thread: [PATCH] mv643xx_eth: fix unicast address filter corruption on mtu change by Lennert Buytenhek on Tuesday, March 10, 2009 - 1:22 am. (2 messages)
[view original message]
From: Stoyan Gaydarov
Subject: [PATCH 03/25] [net] BUG to BUG_ON changes
Date: Monday, March 9, 2009 - 10:10 pm

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
 drivers/net/atl1e/atl1e_main.c    |    3 +--
 drivers/net/chelsio/sge.c         |    3 +--
 drivers/net/ixgb/ixgb_osdep.h     |    2 +-
 drivers/net/pppol2tp.c            |    3 +--
 drivers/net/wireless/ath9k/core.h |    6 +-----
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index bb9094d..d089550 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1794,8 +1794,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
 			memcpy(use_tpd, tpd, sizeof(struct atl1e_tpd_desc));
 
 			tx_buffer = atl1e_get_tx_buffer(adapter, use_tpd);
-			if (tx_buffer->skb)
-				BUG();
+			BUG_ON(tx_buffer->skb);
 
 			tx_buffer->skb = NULL;
 			tx_buffer->length =
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index d984b79..e60f610 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1149,8 +1149,7 @@ static inline void write_tx_desc(struct cmdQ_e *e, dma_addr_t mapping,
 				 unsigned int len, unsigned int gen,
 				 unsigned int eop)
 {
-	if (unlikely(len > SGE_TX_DESC_MAX_PLEN))
-		BUG();
+	BUG_ON(len > SGE_TX_DESC_MAX_PLEN);
 	e->addr_lo = (u32)mapping;
 	e->addr_hi = (u64)mapping >> 32;
 	e->len_gen = V_CMD_LEN(len) | V_CMD_GEN1(gen);
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index d92e72b..371a6be 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -40,7 +40,7 @@
 #include <linux/sched.h>
 
 #undef ASSERT
-#define ASSERT(x)	if (!(x)) BUG()
+#define ASSERT(x)	BUG_ON(!(x))
 #define MSGOUT(S, A, B)	printk(KERN_DEBUG S "\n", A, B)
 
 #ifdef DBG
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index f1a9467..97959b3 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -1222,8 +1222,7 @@ static void pppol2tp_tunnel_closeall(struct pppol2tp_tunnel *tunnel)
 	struct ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 03/25] [net] BUG to BUG_ON changes
Date: Monday, March 9, 2009 - 10:16 pm

From: Stoyan Gaydarov <stoyboyker@gmail.com>

Acked-by: David S. Miller <davem@davemloft.net>
--


[ message continues ]
[view original message]
From: Alexey Dobriyan
Subject: Re: [PATCH 03/25] [net] BUG to BUG_ON changes
Date: Tuesday, March 10, 2009 - 3:23 am

--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 03/25] [net] BUG to BUG_ON changes
Date: Tuesday, March 10, 2009 - 4:24 am

From: Alexey Dobriyan <adobriyan@gmail.com>

I think in situations such as this, where someone is trying to rid the
tree of an interface (where an exactly equivalent alternative
expression exists) so it can be deleted, it is absolutely unreasonable
to ask them to make non-trivial transformations like you are
requesting on top of what can already be a quite daunting task.

Please rescind your NACK, thanks.

This is the kind of NACK which makes me absolutely furious when I try
to contribute to projects other than the kernel.  So please don't make
the kernel suck as much as those projects do.  It's a deterrant to
contributors.
--


[ message continues ]
[view original message]
From: Brandeburg, Jesse
Subject: RE: [PATCH 03/25] [net] BUG to BUG_ON changes
Date: Tuesday, March 10, 2009 - 12:54 pm

ack the ixgb portion

Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
--


[ message continues ]
Previous thread: [PATCH] net: fix warning about non-const string by Stephen Hemminger on Monday, March 9, 2009 - 4:51 pm. (1 message)

Next thread: [PATCH] mv643xx_eth: fix unicast address filter corruption on mtu change by Lennert Buytenhek on Tuesday, March 10, 2009 - 1:22 am. (2 messages)