X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fipw2100.h;fp=drivers%2Fnet%2Fwireless%2Fipw2100.h;h=f6c51441fa878a85baa868a9d23af18d69f7c207;hp=55b7227198df4dae1e620b74d70903ab1fea9d22;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c

diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index 55b722719..f6c51441f 100644
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of version 2 of the GNU General Public License as
@@ -41,12 +41,7 @@
 
 #include <net/ieee80211.h>
 
-#ifdef CONFIG_IPW2100_MONITOR
-#include <net/ieee80211_radiotap.h>
-#endif
-
 #include <linux/workqueue.h>
-#include <linux/mutex.h>
 
 struct ipw2100_priv;
 struct ipw2100_tx_packet;
@@ -397,10 +392,8 @@ struct ipw2100_notification {
 #define IPW_WEP104_CIPHER (1<<5)
 #define IPW_CKIP_CIPHER   (1<<6)
 
-#define	IPW_AUTH_OPEN     	0
-#define	IPW_AUTH_SHARED   	1
-#define IPW_AUTH_LEAP	  	2
-#define IPW_AUTH_LEAP_CISCO_ID	0x80
+#define	IPW_AUTH_OPEN     0
+#define	IPW_AUTH_SHARED   1
 
 struct statistic {
 	int value;
@@ -595,8 +588,8 @@ struct ipw2100_priv {
 	int inta_other;
 
 	spinlock_t low_lock;
-	struct mutex action_mutex;
-	struct mutex adapter_mutex;
+	struct semaphore action_sem;
+	struct semaphore adapter_sem;
 
 	wait_queue_head_t wait_command_queue;
 };