diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/atarilance.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/atarilance.c')
| -rw-r--r-- | drivers/net/atarilance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 0c0deceb6938..c5721cb38265 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
| @@ -930,8 +930,8 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id ) | |||
| 930 | } | 930 | } |
| 931 | #endif | 931 | #endif |
| 932 | 932 | ||
| 933 | if (lp->tx_full && (netif_queue_stopped(dev)) | 933 | if (lp->tx_full && (netif_queue_stopped(dev)) && |
| 934 | && dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) { | 934 | dirty_tx > lp->cur_tx - TX_RING_SIZE + 2) { |
| 935 | /* The ring is no longer full, clear tbusy. */ | 935 | /* The ring is no longer full, clear tbusy. */ |
| 936 | lp->tx_full = 0; | 936 | lp->tx_full = 0; |
| 937 | netif_wake_queue (dev); | 937 | netif_wake_queue (dev); |