diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/net/e1000/e1000_main.c | |
| parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 49cd096a3c3d..add8dc4aa7b0 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -3308,8 +3308,7 @@ e1000_clean(struct net_device *poll_dev, int *budget) | |||
| 3308 | 3308 | ||
| 3309 | while (poll_dev != &adapter->polling_netdev[i]) { | 3309 | while (poll_dev != &adapter->polling_netdev[i]) { |
| 3310 | i++; | 3310 | i++; |
| 3311 | if (unlikely(i == adapter->num_rx_queues)) | 3311 | BUG_ON(i == adapter->num_rx_queues); |
| 3312 | BUG(); | ||
| 3313 | } | 3312 | } |
| 3314 | 3313 | ||
| 3315 | if (likely(adapter->num_tx_queues == 1)) { | 3314 | if (likely(adapter->num_tx_queues == 1)) { |