diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-25 09:35:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-25 09:35:12 +0300 |
| commit | 1b0db64fb7693c1a131b7bcc38f7bc63fb396850 (patch) | |
| tree | f393ebcc4496de2424d3f624c3623194e19c8b22 /drivers/net/wireless/p54/p54.h | |
| parent | 26f70e1202b3c66c4f63b8b25e0419dd0b3a91e3 (diff) | |
| parent | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (diff) | |
| download | linux-1b0db64fb7693c1a131b7bcc38f7bc63fb396850.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/p54/p54.h')
| -rw-r--r-- | drivers/net/wireless/p54/p54.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h index 43a3b2ead81a..f951c8f31863 100644 --- a/drivers/net/wireless/p54/p54.h +++ b/drivers/net/wireless/p54/p54.h @@ -116,7 +116,8 @@ struct p54_edcf_queue_param { __le16 txop; } __packed; -struct p54_rssi_linear_approximation { +struct p54_rssi_db_entry { + u16 freq; s16 mul; s16 add; s16 longbow_unkn; @@ -197,13 +198,14 @@ struct p54_common { u8 rx_diversity_mask; u8 tx_diversity_mask; unsigned int output_power; + struct p54_rssi_db_entry *cur_rssi; int noise; /* calibration, output power limit and rssi<->dBm conversation data */ struct pda_iq_autocal_entry *iq_autocal; unsigned int iq_autocal_len; struct p54_cal_database *curve_data; struct p54_cal_database *output_limit; - struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS]; + struct p54_cal_database *rssi_db; struct ieee80211_supported_band *band_table[IEEE80211_NUM_BANDS]; /* BBP/MAC state */ |