diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-04-11 14:50:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 15:44:36 -0700 |
| commit | 0ee904c35cc3fdd26a9c76077d9692d458309186 (patch) | |
| tree | ce1dee044974b7c6040bbdb794747cd1baa8f6bb /drivers/net/atlx | |
| parent | 710b523ac59426e8bfdea3533f42118e46b9cbfb (diff) | |
| download | blackbird-op-linux-0ee904c35cc3fdd26a9c76077d9692d458309186.tar.gz blackbird-op-linux-0ee904c35cc3fdd26a9c76077d9692d458309186.zip | |
drivers/net: replace BUG() with BUG_ON() if possible
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atlx')
| -rw-r--r-- | drivers/net/atlx/atl1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 0ab22540bf59..13f0bdc32449 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -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; |
