git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
orinoco.h
diff --git
a/drivers/net/wireless/orinoco.h
b/drivers/net/wireless/orinoco.h
index
16db3e1
..
f5d856d
100644
(file)
--- a/
drivers/net/wireless/orinoco.h
+++ b/
drivers/net/wireless/orinoco.h
@@
-7,7
+7,7
@@
#ifndef _ORINOCO_H
#define _ORINOCO_H
#ifndef _ORINOCO_H
#define _ORINOCO_H
-#define DRIVER_VERSION "0.15"
+#define DRIVER_VERSION "0.15
rc3
"
#include <linux/netdevice.h>
#include <linux/wireless.h>
#include <linux/netdevice.h>
#include <linux/wireless.h>
@@
-30,6
+30,20
@@
struct orinoco_key {
char data[ORINOCO_MAX_KEY_SIZE];
} __attribute__ ((packed));
char data[ORINOCO_MAX_KEY_SIZE];
} __attribute__ ((packed));
+struct header_struct {
+ /* 802.3 */
+ u8 dest[ETH_ALEN];
+ u8 src[ETH_ALEN];
+ __be16 len;
+ /* 802.2 */
+ u8 dsap;
+ u8 ssap;
+ u8 ctrl;
+ /* SNAP */
+ u8 oui[3];
+ unsigned short ethertype;
+} __attribute__ ((packed));
+
typedef enum {
FIRMWARE_TYPE_AGERE,
FIRMWARE_TYPE_INTERSIL,
typedef enum {
FIRMWARE_TYPE_AGERE,
FIRMWARE_TYPE_INTERSIL,
@@
-118,6
+132,9
@@
extern int orinoco_debug;
#define DEBUG(n, args...) do { } while (0)
#endif /* ORINOCO_DEBUG */
#define DEBUG(n, args...) do { } while (0)
#endif /* ORINOCO_DEBUG */
+#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", devname, __FUNCTION__);
+#define TRACE_EXIT(devname) DEBUG(2, "%s: <- %s()\n", devname, __FUNCTION__);
+
/********************************************************************/
/* Exported prototypes */
/********************************************************************/
/********************************************************************/
/* Exported prototypes */
/********************************************************************/