patch-2.4.11-dontuse linux/drivers/net/wireless/orinoco.h

Next file: linux/drivers/net/wireless/orinoco_cs.c
Previous file: linux/drivers/net/wireless/orinoco.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.10/linux/drivers/net/wireless/orinoco.h linux/drivers/net/wireless/orinoco.h
@@ -8,7 +8,7 @@
 #define _ORINOCO_H
 
 /* To enable debug messages */
-//#define ORINOCO_DEBUG		3
+/*  #define ORINOCO_DEBUG		3 */
 
 #if (! defined (WIRELESS_EXT)) || (WIRELESS_EXT < 10)
 #error "orinoco_cs requires Wireless extensions v10 or later."
@@ -25,7 +25,7 @@
 #define DLDWD_MACPORT		0
 #define IRQ_LOOP_MAX		10
 #define TX_NICBUF_SIZE		2048
-#define TX_NICBUF_SIZE_BUG	1585		/* Bug in Intel firmware */
+#define TX_NICBUF_SIZE_BUG	1585		/* Bug in Symbol firmware */
 #define MAX_KEYS		4
 #define MAX_KEY_SIZE		14
 #define LARGE_KEY_SIZE		13
@@ -33,7 +33,7 @@
 #define MAX_FRAME_SIZE		2304
 
 typedef struct dldwd_key {
-	uint16_t len;
+	uint16_t len;	/* always store little-endian */
 	char data[MAX_KEY_SIZE];
 } __attribute__ ((packed)) dldwd_key_t;
 
@@ -110,7 +110,7 @@
 
 #ifdef ORINOCO_DEBUG
 extern int dldwd_debug;
-#define DEBUG(n, args...) if (dldwd_debug>(n)) printk(KERN_DEBUG args)
+#define DEBUG(n, args...) do { if (dldwd_debug>(n)) printk(KERN_DEBUG args); } while(0)
 #define DEBUGMORE(n, args...) do { if (dldwd_debug>(n)) printk(args); } while (0)
 #else
 #define DEBUG(n, args...) do { } while (0)
@@ -119,9 +119,6 @@
 
 #define TRACE_ENTER(devname) DEBUG(2, "%s: -> " __FUNCTION__ "()\n", devname);
 #define TRACE_EXIT(devname)  DEBUG(2, "%s: <- " __FUNCTION__ "()\n", devname);
-
-#define MAX(a, b) ( (a) > (b) ? (a) : (b) )
-#define MIN(a, b) ( (a) < (b) ? (a) : (b) )
 
 #define RUP_EVEN(a) ( (a) % 2 ? (a) + 1 : (a) )
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)