diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /net/core/netpoll.c | |
| parent | bff38771e1065c7fc3de87e47ba366151eea573c (diff) | |
| parent | e594e96e8a14101a6decabf6746bd5186287debc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 3afe381e24a5..0ac309154b0d 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -744,7 +744,7 @@ int netpoll_setup(struct netpoll *np) | |||
| 744 | np->name); | 744 | np->name); |
| 745 | break; | 745 | break; |
| 746 | } | 746 | } |
| 747 | cond_resched(); | 747 | msleep(1); |
| 748 | } | 748 | } |
| 749 | 749 | ||
| 750 | /* If carrier appears to come up instantly, we don't | 750 | /* If carrier appears to come up instantly, we don't |