diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /drivers/net/ns83820.c | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 8e9b1a537dee..706aed7d717f 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -568,8 +568,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb) | |||
| 568 | #endif | 568 | #endif |
| 569 | 569 | ||
| 570 | sg = dev->rx_info.descs + (next_empty * DESC_SIZE); | 570 | sg = dev->rx_info.descs + (next_empty * DESC_SIZE); |
| 571 | if (unlikely(NULL != dev->rx_info.skbs[next_empty])) | 571 | BUG_ON(NULL != dev->rx_info.skbs[next_empty]); |
| 572 | BUG(); | ||
| 573 | dev->rx_info.skbs[next_empty] = skb; | 572 | dev->rx_info.skbs[next_empty] = skb; |
| 574 | 573 | ||
| 575 | dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC; | 574 | dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC; |