diff options
Diffstat (limited to 'drivers/net/wireless/p54/p54.h')
-rw-r--r-- | drivers/net/wireless/p54/p54.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h index b03d13edc61f..3d44ab34ee69 100644 --- a/drivers/net/wireless/p54/p54.h +++ b/drivers/net/wireless/p54/p54.h | |||
@@ -38,7 +38,7 @@ struct p54_control_hdr { | |||
38 | u8 data[0]; | 38 | u8 data[0]; |
39 | } __attribute__ ((packed)); | 39 | } __attribute__ ((packed)); |
40 | 40 | ||
41 | #define EEPROM_READBACK_LEN (sizeof(struct p54_control_hdr) + 4 /* p54_eeprom_lm86 */) | 41 | #define EEPROM_READBACK_LEN 0x3fc |
42 | 42 | ||
43 | #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000 | 43 | #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000 |
44 | 44 | ||
@@ -63,18 +63,19 @@ struct p54_common { | |||
63 | struct pda_channel_output_limit *output_limit; | 63 | struct pda_channel_output_limit *output_limit; |
64 | unsigned int output_limit_len; | 64 | unsigned int output_limit_len; |
65 | struct pda_pa_curve_data *curve_data; | 65 | struct pda_pa_curve_data *curve_data; |
66 | __le16 rxhw; | 66 | u16 rxhw; |
67 | u8 version; | 67 | u8 version; |
68 | unsigned int tx_hdr_len; | 68 | unsigned int tx_hdr_len; |
69 | void *cached_vdcf; | 69 | void *cached_vdcf; |
70 | unsigned int fw_var; | 70 | unsigned int fw_var; |
71 | struct ieee80211_tx_queue_stats tx_stats[8]; | 71 | struct ieee80211_tx_queue_stats tx_stats[8]; |
72 | void *eeprom; | ||
73 | struct completion eeprom_comp; | ||
72 | }; | 74 | }; |
73 | 75 | ||
74 | int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb); | 76 | int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb); |
75 | int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw); | 77 | int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw); |
76 | int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len); | 78 | int p54_read_eeprom(struct ieee80211_hw *dev); |
77 | void p54_fill_eeprom_readback(struct p54_control_hdr *hdr); | ||
78 | struct ieee80211_hw *p54_init_common(size_t priv_data_len); | 79 | struct ieee80211_hw *p54_init_common(size_t priv_data_len); |
79 | void p54_free_common(struct ieee80211_hw *dev); | 80 | void p54_free_common(struct ieee80211_hw *dev); |
80 | 81 | ||