diff options
Diffstat (limited to 'drivers/net/wireless/p54/p54.h')
-rw-r--r-- | drivers/net/wireless/p54/p54.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h index 491ab96c7b67..d2dbb9e15d97 100644 --- a/drivers/net/wireless/p54/p54.h +++ b/drivers/net/wireless/p54/p54.h | |||
@@ -85,7 +85,6 @@ struct p54_common { | |||
85 | struct mutex conf_mutex; | 85 | struct mutex conf_mutex; |
86 | u8 mac_addr[ETH_ALEN]; | 86 | u8 mac_addr[ETH_ALEN]; |
87 | u8 bssid[ETH_ALEN]; | 87 | u8 bssid[ETH_ALEN]; |
88 | u16 mac_mode; | ||
89 | struct pda_iq_autocal_entry *iq_autocal; | 88 | struct pda_iq_autocal_entry *iq_autocal; |
90 | unsigned int iq_autocal_len; | 89 | unsigned int iq_autocal_len; |
91 | struct pda_channel_output_limit *output_limit; | 90 | struct pda_channel_output_limit *output_limit; |
@@ -95,7 +94,6 @@ struct p54_common { | |||
95 | bool use_short_slot; | 94 | bool use_short_slot; |
96 | u16 rxhw; | 95 | u16 rxhw; |
97 | u8 version; | 96 | u8 version; |
98 | u8 rx_antenna; | ||
99 | unsigned int tx_hdr_len; | 97 | unsigned int tx_hdr_len; |
100 | unsigned int fw_var; | 98 | unsigned int fw_var; |
101 | unsigned int fw_interface; | 99 | unsigned int fw_interface; |
@@ -115,6 +113,8 @@ struct p54_common { | |||
115 | int noise; | 113 | int noise; |
116 | void *eeprom; | 114 | void *eeprom; |
117 | struct completion eeprom_comp; | 115 | struct completion eeprom_comp; |
116 | u8 privacy_caps; | ||
117 | u8 rx_keycache_size; | ||
118 | }; | 118 | }; |
119 | 119 | ||
120 | int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb); | 120 | int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb); |