diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /drivers/net/amd8111e.c | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rw-r--r-- | drivers/net/amd8111e.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index c54967f7942a..ba1be0b3a8c8 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -833,12 +833,14 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget) | |||
| 833 | 833 | ||
| 834 | } while(intr0 & RINT0); | 834 | } while(intr0 & RINT0); |
| 835 | 835 | ||
| 836 | /* Receive descriptor is empty now */ | 836 | if (rx_pkt_limit > 0) { |
| 837 | spin_lock_irqsave(&lp->lock, flags); | 837 | /* Receive descriptor is empty now */ |
| 838 | __netif_rx_complete(dev, napi); | 838 | spin_lock_irqsave(&lp->lock, flags); |
| 839 | writel(VAL0|RINTEN0, mmio + INTEN0); | 839 | __netif_rx_complete(dev, napi); |
| 840 | writel(VAL2 | RDMD0, mmio + CMD0); | 840 | writel(VAL0|RINTEN0, mmio + INTEN0); |
| 841 | spin_unlock_irqrestore(&lp->lock, flags); | 841 | writel(VAL2 | RDMD0, mmio + CMD0); |
| 842 | spin_unlock_irqrestore(&lp->lock, flags); | ||
| 843 | } | ||
| 842 | 844 | ||
| 843 | rx_not_empty: | 845 | rx_not_empty: |
| 844 | return num_rx_pkt; | 846 | return num_rx_pkt; |