diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-11 13:32:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-11 13:32:31 -0700 |
| commit | 62522d36d74a843e78d17f2dffc90468c6762803 (patch) | |
| tree | d9d21de6724425c1b0ba12991e0865556aeda6b4 /drivers/net/8139too.c | |
| parent | a71fba97295db924c0b90266e9833e5059fead24 (diff) | |
| parent | e79aa8671033535c2e9ffc0a68010ae49ed5734c (diff) | |
| download | lwn-62522d36d74a843e78d17f2dffc90468c6762803.tar.gz lwn-62522d36d74a843e78d17f2dffc90468c6762803.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/8139too.c')
| -rw-r--r-- | drivers/net/8139too.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index cc7d46238801..f5166dccd8df 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -860,6 +860,7 @@ retry: } /* if unknown chip, assume array element #0, original RTL-8139 in this case */ + i = 0; dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n"); dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig)); tp->chipset = 0; @@ -2088,8 +2089,8 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) * again when we think we are done. */ spin_lock_irqsave(&tp->lock, flags); - RTL_W16_F(IntrMask, rtl8139_intr_mask); __napi_complete(napi); + RTL_W16_F(IntrMask, rtl8139_intr_mask); spin_unlock_irqrestore(&tp->lock, flags); } spin_unlock(&tp->rx_lock); |