rt2x00: Disable powersaving by default in rt2500usb.

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

diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/adm8211.h
index 8d7c564..b07e4d3 100644 (file)
--- a/drivers/net/wireless/adm8211.h
+++ b/drivers/net/wireless/adm8211.h
@@ -266,7 +266,7 @@ do {                                                                \
 #define ADM8211_SYNCTL_CS1     (1 << 28)
 #define ADM8211_SYNCTL_CAL     (1 << 27)
 #define ADM8211_SYNCTL_SELCAL  (1 << 26)
-#define ADM8211_SYNCTL_RFtype  ((1 << 24) || (1 << 23) || (1 << 22))
+#define ADM8211_SYNCTL_RFtype  ((1 << 24) | (1 << 23) | (1 << 22))
 #define ADM8211_SYNCTL_RFMD    (1 << 22)
 #define ADM8211_SYNCTL_GENERAL (0x7 << 22)
 /* SYNCTL 21:0 Data (Si4126: 18-bit data, 4-bit address) */
@@ -443,7 +443,6 @@ struct adm8211_rx_ring_info {
 struct adm8211_tx_ring_info {
        struct sk_buff *skb;
        dma_addr_t mapping;
-       struct ieee80211_tx_control tx_control;
        size_t hdrlen;
 };
 
@@ -554,8 +553,6 @@ struct adm8211_priv {
 
        int channel;
        u8 bssid[ETH_ALEN];
-       u8 ssid[32];
-       size_t ssid_len;
 
        u8 soft_rx_crc;
        u8 retry_limit;