iwlwifi: HW dependent run time calibration

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rtl8187.h

diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index 6124e467b156467d2f7101806a78d29d5edbf531..076d88b6db0e9f69c23d3e952af95b03097a549f 100644 (file)
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -36,8 +36,7 @@ struct rtl8187_rx_info {
 };
 
 struct rtl8187_rx_hdr {
-       __le16 len;
-       __le16 rate;
+       __le32 flags;
        u8 noise;
        u8 signal;
        u8 agc;
@@ -65,15 +64,16 @@ struct rtl8187_tx_hdr {
 struct rtl8187_priv {
        /* common between rtl818x drivers */
        struct rtl818x_csr *map;
-       void (*rf_init)(struct ieee80211_hw *);
+       const struct rtl818x_rf_ops *rf;
+       struct ieee80211_vif *vif;
        int mode;
 
        /* rtl8187 specific */
        struct ieee80211_channel channels[14];
        struct ieee80211_rate rates[12];
-       struct ieee80211_hw_mode modes[2];
+       struct ieee80211_supported_band band;
        struct usb_device *udev;
-       u8 *hwaddr;
+       u32 rx_conf;
        u16 txpwr_base;
        u8 asic_rev;
        struct sk_buff_head rx_queue;