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/yellowfin.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/yellowfin.c')
| -rw-r--r-- | drivers/net/yellowfin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 40ad0dee0406..0f773a9a3ff2 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
| @@ -579,7 +579,7 @@ static int yellowfin_open(struct net_device *dev) | |||
| 579 | /* Reset the chip. */ | 579 | /* Reset the chip. */ |
| 580 | iowrite32(0x80000000, ioaddr + DMACtrl); | 580 | iowrite32(0x80000000, ioaddr + DMACtrl); |
| 581 | 581 | ||
| 582 | ret = request_irq(dev->irq, &yellowfin_interrupt, IRQF_SHARED, dev->name, dev); | 582 | ret = request_irq(dev->irq, yellowfin_interrupt, IRQF_SHARED, dev->name, dev); |
| 583 | if (ret) | 583 | if (ret) |
| 584 | return ret; | 584 | return ret; |
| 585 | 585 | ||
| @@ -944,8 +944,8 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance) | |||
| 944 | dev_kfree_skb_irq(skb); | 944 | dev_kfree_skb_irq(skb); |
| 945 | yp->tx_skbuff[entry] = NULL; | 945 | yp->tx_skbuff[entry] = NULL; |
| 946 | } | 946 | } |
| 947 | if (yp->tx_full | 947 | if (yp->tx_full && |
| 948 | && yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE - 4) { | 948 | yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE - 4) { |
| 949 | /* The ring is no longer full, clear tbusy. */ | 949 | /* The ring is no longer full, clear tbusy. */ |
| 950 | yp->tx_full = 0; | 950 | yp->tx_full = 0; |
| 951 | netif_wake_queue(dev); | 951 | netif_wake_queue(dev); |
| @@ -1014,8 +1014,8 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance) | |||
| 1014 | } | 1014 | } |
| 1015 | #endif | 1015 | #endif |
| 1016 | 1016 | ||
| 1017 | if (yp->tx_full | 1017 | if (yp->tx_full && |
| 1018 | && yp->cur_tx - dirty_tx < TX_QUEUE_SIZE - 2) { | 1018 | yp->cur_tx - dirty_tx < TX_QUEUE_SIZE - 2) { |
| 1019 | /* The ring is no longer full, clear tbusy. */ | 1019 | /* The ring is no longer full, clear tbusy. */ |
| 1020 | yp->tx_full = 0; | 1020 | yp->tx_full = 0; |
| 1021 | netif_wake_queue(dev); | 1021 | netif_wake_queue(dev); |