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

Commit 0ee904c3 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by David S. Miller
Browse files

drivers/net: replace BUG() with BUG_ON() if possible 



Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 710b523a

drivers/net/atl1e/atl1e_main.c

+1 −2
Original line number Diff line number Diff line
@@ -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 =

drivers/net/atlx/atl1.c

+3 −4
Original line number Diff line number Diff line
@@ -2207,8 +2207,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, 
	nr_frags = skb_shinfo(skb)->nr_frags;

	next_to_use = atomic_read(&tpd_ring->next_to_use);

	buffer_info = &tpd_ring->buffer_info[next_to_use];

	if (unlikely(buffer_info->skb))

		BUG();

	BUG_ON(buffer_info->skb);

	/* put skb in last TPD */

	buffer_info->skb = NULL;
@@ -2274,8 +2273,8 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, 
			ATL1_MAX_TX_BUF_LEN;

		for (i = 0; i < nseg; i++) {

			buffer_info = &tpd_ring->buffer_info[next_to_use];

			if (unlikely(buffer_info->skb))

				BUG();

			BUG_ON(buffer_info->skb);



			buffer_info->skb = NULL;

			buffer_info->length = (buf_len > ATL1_MAX_TX_BUF_LEN) ?

				ATL1_MAX_TX_BUF_LEN : buf_len;

drivers/net/chelsio/sge.c

+2 −2
Original line number Diff line number Diff line
@@ -1149,8 +1149,8 @@ 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);

drivers/net/fs_enet/mii-fec.c

+2 −4
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location) 
	fec_t __iomem *fecp = fec->fecp;

	int i, ret = -1;



	if ((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0)

		BUG();

	BUG_ON((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0);



	/* Add PHY address to register command.  */

	out_be32(&fecp->fec_mii_data, (phy_id << 23) | mk_mii_read(location));
@@ -79,8 +78,7 @@ static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location, 
	int i;



	/* this must never happen */

	if ((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0)

		BUG();

	BUG_ON((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0);



	/* Add PHY address to register command.  */

	out_be32(&fecp->fec_mii_data, (phy_id << 23) | mk_mii_write(location, val));

drivers/net/ixgb/ixgb_osdep.h

+1 −1
Original line number Diff line number Diff line
@@ -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