15 files changed, 149 insertions, 112 deletions

diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 09469e7db6a5..955adfb8d64c 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -276,6 +276,7 @@ enum acpi_prefered_pm_profiles {
 
 #define BAF_LEGACY_DEVICES              0x0001
 #define BAF_8042_KEYBOARD_CONTROLLER    0x0002
+#define BAF_MSI_NOT_SUPPORTED           0x0008
 
 #define FADT2_REVISION_ID               3
 #define FADT2_MINUS_REVISION_ID         2
diff --git a/include/asm-powerpc/ucc_fast.h b/include/asm-powerpc/ucc_fast.h
index 39d1c90fd2ca..f529f70b1d82 100644
--- a/include/asm-powerpc/ucc_fast.h
+++ b/include/asm-powerpc/ucc_fast.h
@@ -159,6 +159,9 @@ struct ucc_fast_private {
         struct ucc_fast *uf_regs;       /* a pointer to memory map of UCC regs. */
         u32 *p_ucce;            /* a pointer to the event register in memory. */
         u32 *p_uccm;            /* a pointer to the mask register in memory. */
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        u16 *p_utodr;           /* pointer to the transmit on demand register */
+#endif
         int enabled_tx;         /* Whether channel is enabled for Tx (ENT) */
         int enabled_rx;         /* Whether channel is enabled for Rx (ENR) */
         int stopped_tx;         /* Whether channel has been stopped for Tx
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 6caeb98e29dd..edb31bfff68f 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -159,11 +159,19 @@ enum {
         ATA_CMD_INIT_DEV_PARAMS = 0x91,
         ATA_CMD_READ_NATIVE_MAX = 0xF8,
         ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,
+        ATA_CMD_SET_MAX         = 0xF9,
+        ATA_CMD_SET_MAX_EXT     = 0x37,
         ATA_CMD_READ_LOG_EXT    = 0x2f,
 
         /* READ_LOG_EXT pages */
         ATA_LOG_SATA_NCQ        = 0x10,
 
+        /* READ/WRITE LONG (obsolete) */
+        ATA_CMD_READ_LONG       = 0x22,
+        ATA_CMD_READ_LONG_ONCE  = 0x23,
+        ATA_CMD_WRITE_LONG      = 0x32,
+        ATA_CMD_WRITE_LONG_ONCE = 0x33,
+
         /* SETFEATURES stuff */
         SETFEATURES_XFER        = 0x03,
         XFER_UDMA_7             = 0x47,
@@ -194,6 +202,8 @@ enum {
         SETFEATURES_WC_ON       = 0x02, /* Enable write cache */
         SETFEATURES_WC_OFF      = 0x82, /* Disable write cache */
 
+        SETFEATURES_SPINUP      = 0x07, /* Spin-up drive */
+
         /* ATAPI stuff */
         ATAPI_PKT_DMA           = (1 << 0),
         ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir:
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index abb64c437f6f..73710d617775 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -120,44 +120,5 @@ struct fsl_spi_platform_data {
         u32     sysclk;
 };
 
-/* Ethernet interface (phy management and speed)
-*/
-enum enet_interface {
-        ENET_10_MII,            /* 10 Base T,   MII interface */
-        ENET_10_RMII,           /* 10 Base T,  RMII interface */
-        ENET_10_RGMII,          /* 10 Base T, RGMII interface */
-        ENET_100_MII,           /* 100 Base T,   MII interface */
-        ENET_100_RMII,          /* 100 Base T,  RMII interface */
-        ENET_100_RGMII,         /* 100 Base T, RGMII interface */
-        ENET_1000_GMII,         /* 1000 Base T,  GMII interface */
-        ENET_1000_RGMII,        /* 1000 Base T, RGMII interface */
-        ENET_1000_TBI,          /* 1000 Base T,   TBI interface */
-        ENET_1000_RTBI          /* 1000 Base T,  RTBI interface */
-};
-
-struct ucc_geth_platform_data {
-        /* device specific information */
-        u32                     device_flags;
-        u32                     phy_reg_addr;
-
-        /* board specific information */
-        u32                     board_flags;
-        u8                      rx_clock;
-        u8                      tx_clock;
-        u32                     phy_id;
-        enum enet_interface     phy_interface;
-        u32                     phy_interrupt;
-        u8                      mac_addr[6];
-};
-
-/* Flags related to UCC Gigabit Ethernet device features */
-#define FSL_UGETH_DEV_HAS_GIGABIT               0x00000001
-#define FSL_UGETH_DEV_HAS_COALESCE              0x00000002
-#define FSL_UGETH_DEV_HAS_RMON                  0x00000004
-
-/* Flags in ucc_geth_platform_data */
-#define FSL_UGETH_BRD_HAS_PHY_INTR              0x00000001
-                                /* if not set use a timer */
-
 #endif /* _FSL_DEVICE_H_ */
 #endif /* __KERNEL__ */
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index 0fe562af9c8c..db390c511ada 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -43,8 +43,7 @@ struct hdlc_proto {
         void (*stop)(struct net_device *dev); /* if open & !DCD */
         void (*detach)(struct net_device *dev);
         int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
-        unsigned short (*type_trans)(struct sk_buff *skb,
-                                     struct net_device *dev);
+        __be16 (*type_trans)(struct sk_buff *skb, struct net_device *dev);
         struct module *module;
         struct hdlc_proto *next; /* next protocol in the list */
 };
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 6859a3b14088..71ea92319241 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -99,7 +99,6 @@ extern struct resource ioport_resource;
 extern struct resource iomem_resource;
 
 extern int request_resource(struct resource *root, struct resource *new);
-extern struct resource * ____request_resource(struct resource *root, struct resource *new);
 extern int release_resource(struct resource *new);
 extern int insert_resource(struct resource *parent, struct resource *new);
 extern int allocate_resource(struct resource *root, struct resource *new,
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0cfbcb6f08eb..d8cfc72ea9c1 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -210,6 +210,7 @@ enum {
 
         /* host set flags */
         ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host only */
+        ATA_HOST_STARTED        = (1 << 1),     /* Host started */
 
         /* various lengths of time */
         ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
@@ -281,11 +282,13 @@ enum {
         ATA_EHI_NO_AUTOPSY      = (1 << 2),  /* no autopsy */
         ATA_EHI_QUIET           = (1 << 3),  /* be quiet */
 
-        ATA_EHI_DID_RESET       = (1 << 16), /* already reset this port */
-        ATA_EHI_PRINTINFO       = (1 << 17), /* print configuration info */
-        ATA_EHI_SETMODE         = (1 << 18), /* configure transfer mode */
-        ATA_EHI_POST_SETMODE    = (1 << 19), /* revaildating after setmode */
+        ATA_EHI_DID_SOFTRESET   = (1 << 16), /* already soft-reset this port */
+        ATA_EHI_DID_HARDRESET   = (1 << 17), /* already soft-reset this port */
+        ATA_EHI_PRINTINFO       = (1 << 18), /* print configuration info */
+        ATA_EHI_SETMODE         = (1 << 19), /* configure transfer mode */
+        ATA_EHI_POST_SETMODE    = (1 << 20), /* revaildating after setmode */
 
+        ATA_EHI_DID_RESET       = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
         ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
 
         /* max repeat if error condition is still set after ->error_handler */
@@ -367,34 +370,6 @@ struct ata_ioports {
         void __iomem            *scr_addr;
 };
 
-struct ata_probe_ent {
-        struct list_head        node;
-        struct device           *dev;
-        const struct ata_port_operations *port_ops;
-        struct scsi_host_template *sht;
-        struct ata_ioports      port[ATA_MAX_PORTS];
-        unsigned int            n_ports;
-        unsigned int            dummy_port_mask;
-        unsigned int            pio_mask;
-        unsigned int            mwdma_mask;
-        unsigned int            udma_mask;
-        unsigned long           irq;
-        unsigned long           irq2;
-        unsigned int            irq_flags;
-        unsigned long           port_flags;
-        unsigned long           _host_flags;
-        void __iomem * const    *iomap;
-        void                    *private_data;
-
-        /* port_info for the secondary port.  Together with irq2, it's
-         * used to implement non-uniform secondary port.  Currently,
-         * the only user is ata_piix combined mode.  This workaround
-         * will be removed together with ata_probe_ent when init model
-         * is updated.
-         */
-        const struct ata_port_info *pinfo2;
-};
-
 struct ata_host {
         spinlock_t              lock;
         struct device           *dev;
@@ -427,6 +402,7 @@ struct ata_queued_cmd {
         int                     dma_dir;
 
         unsigned int            pad_len;
+        unsigned int            sect_size;
 
         unsigned int            nbytes;
         unsigned int            curbytes;
@@ -472,6 +448,7 @@ struct ata_device {
         struct scsi_device      *sdev;          /* attached SCSI device */
         /* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */
         u64                     n_sectors;      /* size of device, if ATA */
+        u64                     n_sectors_boot; /* size of ATA device at startup */
         unsigned int            class;          /* ATA_DEV_xxx */
         u16                     id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
         u8                      pio_mode;
@@ -597,11 +574,11 @@ struct ata_port {
 struct ata_port_operations {
         void (*port_disable) (struct ata_port *);
 
-        void (*dev_config) (struct ata_port *, struct ata_device *);
+        void (*dev_config) (struct ata_device *);
 
         void (*set_piomode) (struct ata_port *, struct ata_device *);
         void (*set_dmamode) (struct ata_port *, struct ata_device *);
-        unsigned long (*mode_filter) (const struct ata_port *, struct ata_device *, unsigned long);
+        unsigned long (*mode_filter) (struct ata_device *, unsigned long);
 
         void (*tf_load) (struct ata_port *ap, const struct ata_taskfile *tf);
         void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
@@ -616,6 +593,8 @@ struct ata_port_operations {
 
         void (*post_set_mode) (struct ata_port *ap);
 
+        int (*cable_detect) (struct ata_port *ap);
+
         int  (*check_atapi_dma) (struct ata_queued_cmd *qc);
 
         void (*bmdma_setup) (struct ata_queued_cmd *qc);
@@ -664,6 +643,7 @@ struct ata_port_info {
         unsigned long           mwdma_mask;
         unsigned long           udma_mask;
         const struct ata_port_operations *port_ops;
+        irq_handler_t           irq_handler;
         void                    *private_data;
 };
 
@@ -686,6 +666,7 @@ extern const unsigned long sata_deb_timing_hotplug[];
 extern const unsigned long sata_deb_timing_long[];
 
 extern const struct ata_port_operations ata_dummy_port_ops;
+extern const struct ata_port_info ata_dummy_port_info;
 
 static inline const unsigned long *
 sata_ehc_deb_timing(struct ata_eh_context *ehc)
@@ -701,6 +682,7 @@ static inline int ata_port_is_dummy(struct ata_port *ap)
         return ap->ops == &ata_dummy_port_ops;
 }
 
+extern void sata_print_link_status(struct ata_port *ap);
 extern void ata_port_probe(struct ata_port *);
 extern void __sata_phy_reset(struct ata_port *ap);
 extern void sata_phy_reset(struct ata_port *ap);
@@ -728,7 +710,15 @@ extern int ata_pci_device_resume(struct pci_dev *pdev);
 #endif
 extern int ata_pci_clear_simplex(struct pci_dev *pdev);
 #endif /* CONFIG_PCI */
-extern int ata_device_add(const struct ata_probe_ent *ent);
+extern struct ata_host *ata_host_alloc(struct device *dev, int max_ports);
+extern struct ata_host *ata_host_alloc_pinfo(struct device *dev,
+                        const struct ata_port_info * const * ppi, int n_ports);
+extern int ata_host_start(struct ata_host *host);
+extern int ata_host_register(struct ata_host *host,
+                             struct scsi_host_template *sht);
+extern int ata_host_activate(struct ata_host *host, int irq,
+                             irq_handler_t irq_handler, unsigned long irq_flags,
+                             struct scsi_host_template *sht);
 extern void ata_host_detach(struct ata_host *host);
 extern void ata_host_init(struct ata_host *, struct device *,
                           unsigned long, const struct ata_port_operations *);
@@ -828,11 +818,17 @@ extern void ata_scsi_slave_destroy(struct scsi_device *sdev);
 extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,
                                        int queue_depth);
 extern struct ata_device *ata_dev_pair(struct ata_device *adev);
+extern int ata_do_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);
 extern u8 ata_irq_on(struct ata_port *ap);
 extern u8 ata_dummy_irq_on(struct ata_port *ap);
 extern u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq);
 extern u8 ata_dummy_irq_ack(struct ata_port *ap, unsigned int chk_drq);
 
+extern int ata_cable_40wire(struct ata_port *ap);
+extern int ata_cable_80wire(struct ata_port *ap);
+extern int ata_cable_sata(struct ata_port *ap);
+extern int ata_cable_unknown(struct ata_port *ap);
+
 /*
  * Timing helpers
  */
@@ -870,10 +866,13 @@ struct pci_bits {
         unsigned long           val;
 };
 
-extern struct ata_probe_ent *
-ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int portmask);
+extern int ata_pci_init_native_host(struct ata_host *host,
+                                    unsigned int port_mask);
+extern int ata_pci_prepare_native_host(struct pci_dev *pdev,
+                                const struct ata_port_info * const * ppi,
+                                int n_ports, struct ata_host **r_host);
 extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
-extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_device *, unsigned long);
+extern unsigned long ata_pci_default_filter(struct ata_device *, unsigned long);
 #endif /* CONFIG_PCI */
 
 /*
@@ -1173,6 +1172,7 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
         qc->n_elem = 0;
         qc->err_mask = 0;
         qc->pad_len = 0;
+        qc->sect_size = ATA_SECT_SIZE;
 
         ata_tf_init(qc->dev, &qc->tf);
 
@@ -1220,7 +1220,7 @@ static inline void ata_pad_free(struct ata_port *ap, struct device *dev)
 
 static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host)
 {
-        return (struct ata_port *) &host->hostdata[0];
+        return *(struct ata_port **)&host->hostdata[0];
 }
 
 #endif /* __LINUX_LIBATA_H__ */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a3ad76221c6f..972491089ac9 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -838,6 +838,7 @@ void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);
 void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr);
 void __iomem * const * pcim_iomap_table(struct pci_dev *pdev);
 int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name);
+void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask);
 
 extern int pci_pci_problems;
 #define PCIPCI_FAIL             1       /* No PCI PCI DMA */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 600308fdf9ce..1b0ddbb8a804 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -368,7 +368,6 @@
 #define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379
 #define PCI_DEVICE_ID_ATI_IXP400_SATA2  0x437a
 #define PCI_DEVICE_ID_ATI_IXP600_SATA   0x4380
-#define PCI_DEVICE_ID_ATI_IXP600_SRAID  0x4381
 #define PCI_DEVICE_ID_ATI_IXP600_SMBUS  0x4385
 #define PCI_DEVICE_ID_ATI_IXP600_IDE    0x438c
 
@@ -1459,6 +1458,8 @@
 
 #define PCI_VENDOR_ID_TOSHIBA_2         0x102f
 #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030
+#define PCI_DEVICE_ID_TOSHIBA_TC35815_NWU       0x0031
+#define PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939    0x0032
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE      0x0105
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC     0x0108
 #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
diff --git a/include/linux/phy.h b/include/linux/phy.h
index edd4c88ca7d8..2a659789f9ca 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -55,6 +55,7 @@ typedef enum {
         PHY_INTERFACE_MODE_TBI,
         PHY_INTERFACE_MODE_RMII,
         PHY_INTERFACE_MODE_RGMII,
+        PHY_INTERFACE_MODE_RGMII_ID,
         PHY_INTERFACE_MODE_RTBI
 } phy_interface_t;
 
diff --git a/include/linux/sony-laptop.h b/include/linux/sony-laptop.h
new file mode 100644
index 000000000000..e2e036d94e4a
--- /dev/null
+++ b/include/linux/sony-laptop.h
@@ -0,0 +1,34 @@
+#ifndef _SONYLAPTOP_H_
+#define _SONYLAPTOP_H_
+
+#include <linux/types.h>
+
+#ifdef __KERNEL__
+
+/* used only for communication between v4l and sony-laptop */
+
+#define SONY_PIC_COMMAND_GETCAMERA               1      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERA               2
+#define SONY_PIC_COMMAND_GETCAMERABRIGHTNESS     3      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERABRIGHTNESS     4
+#define SONY_PIC_COMMAND_GETCAMERACONTRAST       5      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERACONTRAST       6
+#define SONY_PIC_COMMAND_GETCAMERAHUE            7      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERAHUE            8
+#define SONY_PIC_COMMAND_GETCAMERACOLOR          9      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERACOLOR         10
+#define SONY_PIC_COMMAND_GETCAMERASHARPNESS     11      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERASHARPNESS     12
+#define SONY_PIC_COMMAND_GETCAMERAPICTURE       13      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERAPICTURE       14
+#define SONY_PIC_COMMAND_GETCAMERAAGC           15      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERAAGC           16
+#define SONY_PIC_COMMAND_GETCAMERADIRECTION     17      /* obsolete */
+#define SONY_PIC_COMMAND_GETCAMERAROMVERSION    18      /* obsolete */
+#define SONY_PIC_COMMAND_GETCAMERAREVISION      19      /* obsolete */
+
+int sony_pic_camera_command(int command, u8 value);
+
+#endif  /* __KERNEL__ */
+
+#endif /* _SONYLAPTOP_H_ */
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 48759b2f57d7..0987aa7a6cf5 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -186,7 +186,7 @@
  *      - Wireless Event capability in struct iw_range
  *      - Add support for relative TxPower (yick !)
  *
- * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * V17 to V18 (From Jouni Malinen <j@w1.fi>)
  * ----------
  *      - Add support for WPA/WPA2
  *      - Add extended encoding configuration (SIOCSIWENCODEEXT and
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index e02d85f56e60..d56b2923d61a 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -6,8 +6,8 @@
  * LAN access point) driver for Intersil Prism2/2.5/3.
  *
  * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
- * <jkmaline@cc.hut.fi>
- * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  *
  * Adaption to a generic IEEE 802.11 stack by James Ketrenos
  * <jketreno@linux.intel.com>
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index eb476414fd72..b3d65e0bedd3 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -3,8 +3,8 @@
  * for Intersil Prism2/2.5/3.
  *
  * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
- * <jkmaline@cc.hut.fi>
- * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+ * <j@w1.fi>
+ * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  *
  * Adaption to a generic IEEE 802.11 stack by James Ketrenos
  * <jketreno@linux.intel.com>
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 429b73892a5f..a0c2b41a24d7 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -66,7 +66,9 @@
  */
 #define IEEE80211_RADIOTAP_HDRLEN       64
 
-/* The radio capture header precedes the 802.11 header. */
+/* The radio capture header precedes the 802.11 header.
+ * All data in the header is little endian on all platforms.
+ */
 struct ieee80211_radiotap_header {
         u8 it_version;          /* Version 0. Only increases
                                  * for drastic changes,
@@ -74,12 +76,12 @@ struct ieee80211_radiotap_header {
                                  * new fields does not count.
                                  */
         u8 it_pad;
-        u16 it_len;             /* length of the whole
+        __le16 it_len;          /* length of the whole
                                  * header in bytes, including
                                  * it_version, it_pad,
                                  * it_len, and data fields.
                                  */
-        u32 it_present;         /* A bitmap telling which
+        __le32 it_present;      /* A bitmap telling which
                                  * fields are present. Set bit 31
                                  * (0x80000000) to extend the
                                  * bitmap by another 32 bits.
@@ -88,89 +90,102 @@ struct ieee80211_radiotap_header {
                                  */
 };
 
-/* Name                                 Data type       Units
- * ----                                 ---------       -----
+/* Name                                 Data type    Units
+ * ----                                 ---------    -----
  *
- * IEEE80211_RADIOTAP_TSFT              u64       microseconds
+ * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
  *
  *      Value in microseconds of the MAC's 64-bit 802.11 Time
  *      Synchronization Function timer when the first bit of the
  *      MPDU arrived at the MAC. For received frames, only.
  *
- * IEEE80211_RADIOTAP_CHANNEL           2 x u16   MHz, bitmap
+ * IEEE80211_RADIOTAP_CHANNEL           2 x __le16   MHz, bitmap
  *
  *      Tx/Rx frequency in MHz, followed by flags (see below).
  *
- * IEEE80211_RADIOTAP_FHSS              u16       see below
+ * IEEE80211_RADIOTAP_FHSS              __le16       see below
  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *
- * IEEE80211_RADIOTAP_RATE              u8        500kb/s
+ * IEEE80211_RADIOTAP_RATE              u8           500kb/s
  *
  *      Tx/Rx data rate
  *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF signal power at the antenna, decibel difference from
  *      one milliwatt.
  *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
  *
  *      RF signal power at the antenna, decibel difference from an
  *      arbitrary, fixed reference.
  *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
  *
  *      RF noise power at the antenna, decibel difference from an
  *      arbitrary, fixed reference point.
  *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      u16       unitless
+ * IEEE80211_RADIOTAP_LOCK_QUALITY      __le16       unitless
  *
  *      Quality of Barker code lock. Unitless. Monotonically
  *      nondecreasing with "better" lock strength. Called "Signal
  *      Quality" in datasheets.  (Is there a standard way to measure
  *      this?)
  *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    u16       unitless
+ * IEEE80211_RADIOTAP_TX_ATTENUATION    __le16       unitless
  *
  *      Transmit power expressed as unitless distance from max
  *      power set at factory calibration.  0 is max power.
  *      Monotonically nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u16       decibels (dB)
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION __le16       decibels (dB)
  *
  *      Transmit power expressed as decibel distance from max power
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *
- * IEEE80211_RADIOTAP_FLAGS             u8        bitmap
+ * IEEE80211_RADIOTAP_FLAGS             u8           bitmap
  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *
- * IEEE80211_RADIOTAP_ANTENNA           u8        antenna index
+ * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *
- * IEEE80211_RADIOTAP_FCS               u32       data
+ * IEEE80211_RADIOTAP_RX_FLAGS          __le16       bitmap
+ *
+ *     Properties of received frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_TX_FLAGS          __le16       bitmap
+ *
+ *     Properties of transmitted frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
+ *
+ *     Number of rts retries a transmitted frame used.
+ *
+ * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
+ *
+ *     Number of unicast retries a transmitted frame used.
  *
- *      FCS from frame in network byte order.
  */
 enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_TSFT = 0,
@@ -187,7 +202,11 @@ enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_ANTENNA = 11,
         IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
         IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-        IEEE80211_RADIOTAP_EXT = 31,
+        IEEE80211_RADIOTAP_RX_FLAGS = 14,
+        IEEE80211_RADIOTAP_TX_FLAGS = 15,
+        IEEE80211_RADIOTAP_RTS_RETRIES = 16,
+        IEEE80211_RADIOTAP_DATA_RETRIES = 17,
+        IEEE80211_RADIOTAP_EXT = 31
 };
 
 /* Channel flags. */
@@ -219,6 +238,14 @@ enum ieee80211_radiotap_type {
                                                  * 802.11 header and payload
                                                  * (to 32-bit boundary)
                                                  */
+/* For IEEE80211_RADIOTAP_RX_FLAGS */
+#define IEEE80211_RADIOTAP_F_RX_BADFCS  0x0001  /* frame failed crc check */
+
+/* For IEEE80211_RADIOTAP_TX_FLAGS */
+#define IEEE80211_RADIOTAP_F_TX_FAIL    0x0001  /* failed due to excessive
+                                                 * retries */
+#define IEEE80211_RADIOTAP_F_TX_CTS     0x0002  /* used cts 'protection' */
+#define IEEE80211_RADIOTAP_F_TX_RTS     0x0004  /* used rts/cts handshake */
 
 /* Ugly macro to convert literal channel numbers into their mhz equivalents
  * There are certianly some conditions that will break this (like feeding it '30')