Fix namespace clash with proc stuff an compilation warnings.
diff -urN linux-2.5.20/drivers/net/wireless/airo.c linux/drivers/net/wireless/airo.c
--- linux-2.5.20/drivers/net/wireless/airo.c 2002-06-03 03:44:41.000000000 +0200
+++ linux/drivers/net/wireless/airo.c 2002-06-03 09:55:16.000000000 +0200
@@ -191,12 +191,6 @@
#ifndef RUN_AT
#define RUN_AT(x) (jiffies+(x))
#endif
-#ifndef PDE
-static inline struct proc_dir_entry *PDE(const struct inode *inode)
-{
- return inode->u.generic_ip;
-}
-#endif
/* These variables are for insmod, since it seems that the rates
@@ -723,7 +717,7 @@
/* Leave gap of 40 commands after AIROGSTATSD32 for future */
-#define AIROPCAP AIROGSTATSD32 + 40
+#define AIROPCAP AIROGSTATSD32 + 40
#define AIROPVLIST AIROPCAP + 1
#define AIROPSLIST AIROPVLIST + 1
#define AIROPCFG AIROPSLIST + 1
@@ -845,7 +839,7 @@
struct proc_dir_entry *proc_entry;
struct airo_info *next;
spinlock_t aux_lock;
- int flags;
+ unsigned long flags;
#define FLAG_PROMISC IFF_PROMISC
#define FLAG_RADIO_OFF 0x02
#define FLAG_LOCKED 2
@@ -866,7 +860,7 @@
#ifdef WIRELESS_EXT
struct iw_statistics wstats; // wireless stats
unsigned long scan_timestamp; /* Time started to scan */
- struct tq_struct event_task;
+ struct tq_struct event_task;
#ifdef WIRELESS_SPY
int spy_number;
u_char spy_address[IW_MAX_SPY][6];
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Jun 07 2002 - 22:00:15 EST