patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / wireless / prism54 / islpci_eth.h

diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h
index 35845f2..bc9d7a6 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_eth.h
+++ b/drivers/net/wireless/prism54/islpci_eth.h
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.h,v 1.5 2004/01/12 22:16:32 jmaurer Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *
@@ -23,9 +23,51 @@
 #include "isl_38xx.h"
 #include "islpci_dev.h"
 
+struct rfmon_header {
+       u16 unk0;               /* = 0x0000 */
+       u16 length;             /* = 0x1400 */
+       u32 clock;              /* 1MHz clock */
+       u8 flags;
+       u8 unk1;
+       u8 rate;
+       u8 unk2;
+       u16 freq;
+       u16 unk3;
+       u8 rssi;
+       u8 padding[3];
+} __attribute__ ((packed));
+
+struct rx_annex_header {
+       u8 addr1[ETH_ALEN];
+       u8 addr2[ETH_ALEN];
+       struct rfmon_header rfmon;
+} __attribute__ ((packed));
+
+/* wlan-ng (and hopefully others) AVS header, version one.  Fields in
+ * network byte order. */
+#define P80211CAPTURE_VERSION 0x80211001
+
+struct avs_80211_1_header {
+       uint32_t version;
+       uint32_t length;
+       uint64_t mactime;
+       uint64_t hosttime;
+       uint32_t phytype;
+       uint32_t channel;
+       uint32_t datarate;
+       uint32_t antenna;
+       uint32_t priority;
+       uint32_t ssi_type;
+       int32_t ssi_signal;
+       int32_t ssi_noise;
+       uint32_t preamble;
+       uint32_t encoding;
+};
+
 void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *);
 int islpci_eth_transmit(struct sk_buff *, struct net_device *);
 int islpci_eth_receive(islpci_private *);
 void islpci_eth_tx_timeout(struct net_device *);
+void islpci_do_reset_and_wake(void *data);
 
 #endif                         /* _ISL_GEN_H */