diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /drivers/net/sfc/siena.c | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/sfc/siena.c')
| -rw-r--r-- | drivers/net/sfc/siena.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c index 38dcc42c4f79..e0c46f59d1f8 100644 --- a/drivers/net/sfc/siena.c +++ b/drivers/net/sfc/siena.c | |||
| @@ -456,8 +456,17 @@ static int siena_try_update_nic_stats(struct efx_nic *efx) | |||
| 456 | 456 | ||
| 457 | static void siena_update_nic_stats(struct efx_nic *efx) | 457 | static void siena_update_nic_stats(struct efx_nic *efx) |
| 458 | { | 458 | { |
| 459 | while (siena_try_update_nic_stats(efx) == -EAGAIN) | 459 | int retry; |
| 460 | cpu_relax(); | 460 | |
| 461 | /* If we're unlucky enough to read statistics wduring the DMA, wait | ||
| 462 | * up to 10ms for it to finish (typically takes <500us) */ | ||
| 463 | for (retry = 0; retry < 100; ++retry) { | ||
| 464 | if (siena_try_update_nic_stats(efx) == 0) | ||
| 465 | return; | ||
| 466 | udelay(100); | ||
| 467 | } | ||
| 468 | |||
| 469 | /* Use the old values instead */ | ||
| 461 | } | 470 | } |
| 462 | 471 | ||
| 463 | static void siena_start_nic_stats(struct efx_nic *efx) | 472 | static void siena_start_nic_stats(struct efx_nic *efx) |