diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/mlx4/en_selftest.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 9c91a92da70..191a8dcd8a9 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); |