1 files changed, 65 insertions, 11 deletions

diff --git a/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
index 30523314da43..291a55970d1a 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
+++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
@@ -24,27 +24,64 @@
 #define ANAPARAM_PWR1_SHIFT     20
 #define ANAPARAM_PWR1_MASK      (0x7F << ANAPARAM_PWR1_SHIFT)
 
+/* rtl8180/rtl8185 have 3 queue + beacon queue.
+ * mac80211 can use just one, + beacon = 2 tot.
+ */
+#define RTL8180_NR_TX_QUEUES 2
+
+/* rtl8187SE have 6 queues + beacon queues
+ * mac80211 can use 4 QoS data queue, + beacon = 5 tot
+ */
+#define RTL8187SE_NR_TX_QUEUES 5
+
+/* for array static allocation, it is the max of above */
+#define RTL818X_NR_TX_QUEUES 5
+
 struct rtl8180_tx_desc {
         __le32 flags;
         __le16 rts_duration;
         __le16 plcp_len;
         __le32 tx_buf;
-        __le32 frame_len;
+        union{
+                __le32 frame_len;
+                struct {
+                        __le16 frame_len_se;
+                        __le16 frame_duration;
+                } __packed;
+        } __packed;
         __le32 next_tx_desc;
         u8 cw;
         u8 retry_limit;
         u8 agc;
         u8 flags2;
-        u32 reserved[2];
+        /* rsvd for 8180/8185.
+         * valid for 8187se but we dont use it
+         */
+        u32 reserved;
+        /* all rsvd for 8180/8185 */
+        __le16 flags3;
+        __le16 frag_qsize;
+} __packed;
+
+struct rtl818x_rx_cmd_desc {
+        __le32 flags;
+        u32 reserved;
+        __le32 rx_buf;
 } __packed;
 
 struct rtl8180_rx_desc {
         __le32 flags;
         __le32 flags2;
-        union {
-                __le32 rx_buf;
-                __le64 tsft;
-        };
+        __le64 tsft;
+
+} __packed;
+
+struct rtl8187se_rx_desc {
+        __le32 flags;
+        __le64 tsft;
+        __le32 flags2;
+        __le32 flags3;
+        u32 reserved[3];
 } __packed;
 
 struct rtl8180_tx_ring {
@@ -71,28 +108,45 @@ struct rtl8180_priv {
 
         /* rtl8180 driver specific */
         spinlock_t lock;
-        struct rtl8180_rx_desc *rx_ring;
+        void *rx_ring;
+        u8 rx_ring_sz;
         dma_addr_t rx_ring_dma;
         unsigned int rx_idx;
         struct sk_buff *rx_buf[32];
-        struct rtl8180_tx_ring tx_ring[4];
+        struct rtl8180_tx_ring tx_ring[RTL818X_NR_TX_QUEUES];
         struct ieee80211_channel channels[14];
         struct ieee80211_rate rates[12];
         struct ieee80211_supported_band band;
+        struct ieee80211_tx_queue_params queue_param[4];
         struct pci_dev *pdev;
         u32 rx_conf;
-
-        int r8185;
+        u8 slot_time;
+        u16 ack_time;
+
+        enum {
+                RTL818X_CHIP_FAMILY_RTL8180,
+                RTL818X_CHIP_FAMILY_RTL8185,
+                RTL818X_CHIP_FAMILY_RTL8187SE,
+        } chip_family;
         u32 anaparam;
         u16 rfparam;
         u8 csthreshold;
-
+        u8 mac_addr[ETH_ALEN];
+        u8 rf_type;
+        u8 xtal_out;
+        u8 xtal_in;
+        u8 xtal_cal;
+        u8 thermal_meter_val;
+        u8 thermal_meter_en;
+        u8 antenna_diversity_en;
+        u8 antenna_diversity_default;
         /* sequence # */
         u16 seqno;
 };
 
 void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);
 void rtl8180_set_anaparam(struct rtl8180_priv *priv, u32 anaparam);
+void rtl8180_set_anaparam2(struct rtl8180_priv *priv, u32 anaparam2);
 
 static inline u8 rtl818x_ioread8(struct rtl8180_priv *priv, u8 __iomem *addr)
 {