diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
| commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
| tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /net/ipv4/ipconfig.c | |
| parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
| parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 953129d392d2..e8674baaa8d9 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -1103,10 +1103,8 @@ static int __init ic_dynamic(void) | |||
| 1103 | #endif | 1103 | #endif |
| 1104 | 1104 | ||
| 1105 | jiff = jiffies + (d->next ? CONF_INTER_TIMEOUT : timeout); | 1105 | jiff = jiffies + (d->next ? CONF_INTER_TIMEOUT : timeout); |
| 1106 | while (time_before(jiffies, jiff) && !ic_got_reply) { | 1106 | while (time_before(jiffies, jiff) && !ic_got_reply) |
| 1107 | set_current_state(TASK_UNINTERRUPTIBLE); | 1107 | schedule_timeout_uninterruptible(1); |
| 1108 | schedule_timeout(1); | ||
| 1109 | } | ||
| 1110 | #ifdef IPCONFIG_DHCP | 1108 | #ifdef IPCONFIG_DHCP |
| 1111 | /* DHCP isn't done until we get a DHCPACK. */ | 1109 | /* DHCP isn't done until we get a DHCPACK. */ |
| 1112 | if ((ic_got_reply & IC_BOOTP) | 1110 | if ((ic_got_reply & IC_BOOTP) |