diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-29 14:02:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 14:02:13 -0700 |
| commit | 143b11c03cd42f2284efe5128afc057d8fc86c78 (patch) | |
| tree | 8186830c461b7933c26cdd00b69e4c737c5c88e7 /drivers/net/wireless/p54/p54common.h | |
| parent | af01d537463714e36e2c96d2da35902b76cd6827 (diff) | |
| parent | 18c8adeb0244f823ba78a51e23f813fe68bc3c54 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/p54/p54common.h')
| -rw-r--r-- | drivers/net/wireless/p54/p54common.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h index 9bc2a1cf4b5..a79c1a14691 100644 --- a/drivers/net/wireless/p54/p54common.h +++ b/drivers/net/wireless/p54/p54common.h @@ -89,6 +89,16 @@ struct pda_pa_curve_data_sample_rev1 { u8 data_qpsk; u8 data_16qam; u8 data_64qam; +} __attribute__ ((packed)); + +struct p54_pa_curve_data_sample { + u8 rf_power; + u8 pa_detector; + u8 data_barker; + u8 data_bpsk; + u8 data_qpsk; + u8 data_16qam; + u8 data_64qam; u8 padding; } __attribute__ ((packed)); @@ -212,8 +222,8 @@ struct p54_tx_control_filter { } __attribute__ ((packed)); struct p54_tx_control_channel { - __le16 magic1; - __le16 magic2; + __le16 flags; + __le16 dwell; u8 padding1[20]; struct pda_iq_autocal_entry iq_autocal; u8 pa_points_per_curve; @@ -222,8 +232,13 @@ struct p54_tx_control_channel { u8 val_qpsk; u8 val_16qam; u8 val_64qam; - struct pda_pa_curve_data_sample_rev1 curve_data[0]; - /* additional padding/data after curve_data */ + struct pda_pa_curve_data_sample_rev1 curve_data[8]; + u8 dup_bpsk; + u8 dup_qpsk; + u8 dup_16qam; + u8 dup_64qam; + __le16 rssical_mul; + __le16 rssical_add; } __attribute__ ((packed)); struct p54_tx_control_led { |