[PATCH] iwlwifi: fix add_station to avoid FW error

[safe/jmp/linux-2.6] / drivers / net / wireless / rtl8187.h

diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index 41d0aac..6ad322e 100644 (file)
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -1,3 +1,17 @@
+/*
+ * Definitions for RTL8187 hardware
+ *
+ * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
+ *
+ * Based on the r8187 driver, which is:
+ * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
 #ifndef RTL8187_H
 #define RTL8187_H
 
@@ -22,8 +36,7 @@ struct rtl8187_rx_info {
 };
 
 struct rtl8187_rx_hdr {
-       __le16 len;
-       __le16 rate;
+       __le32 flags;
        u8 noise;
        u8 signal;
        u8 agc;
@@ -53,13 +66,14 @@ struct rtl8187_priv {
        struct rtl818x_csr *map;
        void (*rf_init)(struct ieee80211_hw *);
        int mode;
+       int if_id;
 
        /* rtl8187 specific */
        struct ieee80211_channel channels[14];
        struct ieee80211_rate rates[12];
        struct ieee80211_hw_mode modes[2];
        struct usb_device *udev;
-       u8 *hwaddr;
+       u32 rx_conf;
        u16 txpwr_base;
        u8 asic_rev;
        struct sk_buff_head rx_queue;