diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/mlx4/en_selftest.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/net/mlx4/en_selftest.c')
| -rw-r--r-- | drivers/net/mlx4/en_selftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/mlx4/en_selftest.c index 9c91a92da705..191a8dcd8a93 100644 --- a/drivers/net/mlx4/en_selftest.c +++ b/drivers/net/mlx4/en_selftest.c | |||
| @@ -149,7 +149,7 @@ void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf) | |||
| 149 | 149 | ||
| 150 | netif_carrier_off(dev); | 150 | netif_carrier_off(dev); |
| 151 | retry_tx: | 151 | retry_tx: |
| 152 | /* Wait untill all tx queues are empty. | 152 | /* Wait until all tx queues are empty. |
| 153 | * there should not be any additional incoming traffic | 153 | * there should not be any additional incoming traffic |
| 154 | * since we turned the carrier off */ | 154 | * since we turned the carrier off */ |
| 155 | msleep(200); | 155 | msleep(200); |