diff options
author | Christian Lamparter <chunkeey@web.de> | 2008-10-14 21:55:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:31 -0400 |
commit | 0fdd7c5d2defe8c6873eb8a40a880eb0dc59573d (patch) | |
tree | 359d04aaef41ce6d2fda22c3e487c90f59adbc46 /drivers/net/wireless/p54/p54.h | |
parent | b88b15dfbddc8837569c6dea49348791357de4aa (diff) |
p54: broken out edcf changes
This patch series hopefully increases p54's "longterm" stability.
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54.h')
-rw-r--r-- | drivers/net/wireless/p54/p54.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h index 1da96fe50241..1dace10feb7e 100644 --- a/drivers/net/wireless/p54/p54.h +++ b/drivers/net/wireless/p54/p54.h | |||
@@ -49,6 +49,13 @@ struct p54_control_hdr { | |||
49 | u8 data[0]; | 49 | u8 data[0]; |
50 | } __attribute__ ((packed)); | 50 | } __attribute__ ((packed)); |
51 | 51 | ||
52 | struct p54_edcf_queue_param { | ||
53 | __le16 aifs; | ||
54 | __le16 cwmin; | ||
55 | __le16 cwmax; | ||
56 | __le16 txop; | ||
57 | } __attribute__ ((packed)); | ||
58 | |||
52 | #define EEPROM_READBACK_LEN 0x3fc | 59 | #define EEPROM_READBACK_LEN 0x3fc |
53 | 60 | ||
54 | #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000 | 61 | #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000 |
@@ -85,13 +92,13 @@ struct p54_common { | |||
85 | u8 version; | 92 | u8 version; |
86 | u8 rx_antenna; | 93 | u8 rx_antenna; |
87 | unsigned int tx_hdr_len; | 94 | unsigned int tx_hdr_len; |
88 | void *cached_vdcf; | ||
89 | unsigned int fw_var; | 95 | unsigned int fw_var; |
90 | unsigned int fw_interface; | 96 | unsigned int fw_interface; |
91 | unsigned int output_power; | 97 | unsigned int output_power; |
92 | u32 tsf_low32; | 98 | u32 tsf_low32; |
93 | u32 tsf_high32; | 99 | u32 tsf_high32; |
94 | struct ieee80211_tx_queue_stats tx_stats[8]; | 100 | struct ieee80211_tx_queue_stats tx_stats[8]; |
101 | struct p54_edcf_queue_param qos_params[8]; | ||
95 | struct ieee80211_low_level_stats stats; | 102 | struct ieee80211_low_level_stats stats; |
96 | struct timer_list stats_timer; | 103 | struct timer_list stats_timer; |
97 | struct completion stats_comp; | 104 | struct completion stats_comp; |