diff options
| author | David S. Miller <davem@davemloft.net> | 2005-05-18 22:50:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-05-18 22:50:53 -0700 |
| commit | f7383c22246cfccbe912541dd83103009ed2b537 (patch) | |
| tree | 264daa71bdac2165fe26ab7d3b8010a3609ee1e7 /drivers | |
| parent | 59e6b4343299373bc10dd131ab5142f53ddd838a (diff) | |
| download | op-kernel-dev-f7383c22246cfccbe912541dd83103009ed2b537.zip op-kernel-dev-f7383c22246cfccbe912541dd83103009ed2b537.tar.gz | |
[TG3]: In tg3_poll(), resample status_tag after doing work.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 4ab9680..4d2bdbd 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -2869,9 +2869,6 @@ static int tg3_poll(struct net_device *netdev, int *budget) spin_lock_irqsave(&tp->lock, flags); - if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) - tp->last_tag = sblk->status_tag; - /* handle link change and other phy events */ if (!(tp->tg3_flags & (TG3_FLAG_USE_LINKCHG_REG | @@ -2896,7 +2893,6 @@ static int tg3_poll(struct net_device *netdev, int *budget) * All RX "locking" is done by ensuring outside * code synchronizes with dev->poll() */ - done = 1; if (sblk->idx[0].rx_producer != tp->rx_rcb_ptr) { int orig_budget = *budget; int work_done; @@ -2908,12 +2904,14 @@ static int tg3_poll(struct net_device *netdev, int *budget) *budget -= work_done; netdev->quota -= work_done; - - if (work_done >= orig_budget) - done = 0; } + if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) + tp->last_tag = sblk->status_tag; + rmb(); + /* if no more work, tell net stack and NIC we're done */ + done = !tg3_has_work(tp); if (done) { spin_lock_irqsave(&tp->lock, flags); __netif_rx_complete(netdev); |
