diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/net/mlx4/en_selftest.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
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); |