summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Tourrilhes <jt@bougret.hpl.hp.com>2004-04-16 00:50:17 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-04-16 00:50:17 -0700
commitec7d884beb3dd5bc7a7e7fee282f5f0b7daf579e (patch)
treedef73a82e13b1eeb72864349f44004385b330245
parent63777167c24e0a4112ba41cee2e345d9a361924b (diff)
[IRDA]: Replace sleep_on with wait_event
From Stephen Hemminger.
-rw-r--r--net/irda/irlan/irlan_eth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index f6d88264c632..11a2955f8e09 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -115,10 +115,10 @@ static int irlan_eth_open(struct net_device *dev)
self->disconnect_reason = 0;
irlan_client_wakeup(self, self->saddr, self->daddr);
- /* Make sure we have a hardware address before we return, so DHCP clients gets happy */
- interruptible_sleep_on(&self->open_wait);
-
- return 0;
+ /* Make sure we have a hardware address before we return,
+ so DHCP clients gets happy */
+ return wait_event_interruptible(self->open_wait,
+ !self->tsap_data->connected);
}
/*