aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-08-25 01:49:43 -0400
committerJames Ketrenos <jketreno@linux.intel.com>2005-11-07 18:51:09 -0500
commita0e04ab36048eb1c3da2524b5b0b802b6ab064f0 (patch)
treea12ae524c5da22d51a66440822776b565d22c31c
parent3b9990cb1751d3d267c0e5c94bff0f155c944c66 (diff)
Added wait_state wakeup on scan completion.
Fixed copyright date in ipw2200.h Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
-rw-r--r--drivers/net/wireless/ipw2200.c1
-rw-r--r--drivers/net/wireless/ipw2200.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 53a6bb2dbd4c..9ced5b778a77 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -4450,6 +4450,7 @@ static inline void ipw_rx_notification(struct ipw_priv *priv,
4450 priv->status &= 4450 priv->status &=
4451 ~(STATUS_SCANNING | STATUS_SCAN_ABORTING); 4451 ~(STATUS_SCANNING | STATUS_SCAN_ABORTING);
4452 4452
4453 wake_up_interruptible(&priv->wait_state);
4453 cancel_delayed_work(&priv->scan_check); 4454 cancel_delayed_work(&priv->scan_check);
4454 4455
4455 if (priv->status & STATUS_EXIT_PENDING) 4456 if (priv->status & STATUS_EXIT_PENDING)
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 255f0cb66f64..f2056b62254e 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1,6 +1,6 @@
1/****************************************************************************** 1/******************************************************************************
2 2
3 Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved. 3 Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
4 4
5 This program is free software; you can redistribute it and/or modify it 5 This program is free software; you can redistribute it and/or modify it
6 under the terms of version 2 of the GNU General Public License as 6 under the terms of version 2 of the GNU General Public License as