diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-30 07:56:41 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-30 07:56:44 (GMT) |
| commit | 3ca50496c2677a2b3fdd3ede86660fd1433beac6 (patch) | |
| tree | 97a76d8479a8d8a96e04ed0694b8dbf89457bfcc /drivers/net/sfc/siena.c | |
| parent | 462b04e28a7ec1339c892117c3f20a40e55d0e83 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | linux-fsl-qoriq-3ca50496c2677a2b3fdd3ede86660fd1433beac6.tar.xz | |
Merge commit 'v2.6.34-rc6' into perf/core
Merge reason: update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 38dcc42..e0c46f5 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) static void siena_update_nic_stats(struct efx_nic *efx) { - while (siena_try_update_nic_stats(efx) == -EAGAIN) - cpu_relax(); + int retry; + + /* If we're unlucky enough to read statistics wduring the DMA, wait + * up to 10ms for it to finish (typically takes <500us) */ + for (retry = 0; retry < 100; ++retry) { + if (siena_try_update_nic_stats(efx) == 0) + return; + udelay(100); + } + + /* Use the old values instead */ } static void siena_start_nic_stats(struct efx_nic *efx) |