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

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

[Stoyan Gaydarov]

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 pppol2tp_session *session;
 	struct sock *sk;
 
-	if (tunnel == NULL)
-		BUG();
+	BUG_ON(tunnel == NULL);
 
 	PRINTK(tunnel->debug, PPPOL2TP_MSG_CONTROL, KERN_INFO,
 	       "%s: closing all sessions...\n", tunnel->name);
diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h
index 4ca2aed..d310c68 100644
--- a/drivers/net/wireless/ath9k/core.h
+++ b/drivers/net/wireless/ath9k/core.h
@@ -52,11 +52,7 @@ struct ath_node;
 
 #define A_MAX(a, b) ((a) > (b) ? (a) : (b))
 
-#define ASSERT(exp) do {			\
-		if (unlikely(!(exp))) {		\
-			BUG();			\
-		}				\
-	} while (0)
+#define ASSERT(exp) BUG_ON(!(exp));
 
 #define TSF_TO_TU(_h,_l) \
 	((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
-- 
1.6.1.3

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

[David Miller]

From: Stoyan Gaydarov <stoyboyker@gmail.com>
Date: Tue, 10 Mar 2009 00:10:28 -0500

> Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>

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

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

[Alexey Dobriyan]

On Tue, Mar 10, 2009 at 12:10:28AM -0500, Stoyan Gaydarov wrote:
> --- a/drivers/net/pppol2tp.c
> +++ b/drivers/net/pppol2tp.c
> @@ -1222,8 +1222,7 @@ static void pppol2tp_tunnel_closeall(struct pppol2tp_tunnel *tunnel)
>  	struct pppol2tp_session *session;
>  	struct sock *sk;
>  
> -	if (tunnel == NULL)
> -		BUG();
> +	BUG_ON(tunnel == NULL);

NAK, should be deleted, and kernel will oops anyway.

>  	PRINTK(tunnel->debug, PPPOL2TP_MSG_CONTROL, KERN_INFO,
>  	       "%s: closing all sessions...\n", tunnel->name);

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

[David Miller]

From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 10 Mar 2009 13:23:55 +0300

> On Tue, Mar 10, 2009 at 12:10:28AM -0500, Stoyan Gaydarov wrote:
> > --- a/drivers/net/pppol2tp.c
> > +++ b/drivers/net/pppol2tp.c
> > @@ -1222,8 +1222,7 @@ static void pppol2tp_tunnel_closeall(struct pppol2tp_tunnel *tunnel)
> >  	struct pppol2tp_session *session;
> >  	struct sock *sk;
> >  
> > -	if (tunnel == NULL)
> > -		BUG();
> > +	BUG_ON(tunnel == NULL);
> 
> NAK, should be deleted, and kernel will oops anyway.

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.

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

[Brandeburg, Jesse]

Stoyan Gaydarov wrote:
> 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/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

ack the ixgb portion

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