diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-04 08:58:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 08:58:14 -0800 |
| commit | 10be7eb36b93364b98688831ee7d26f58402bb96 (patch) | |
| tree | eb13ae80fcaa8baacd804a721c5a4962a501a2a4 /drivers/net/wireless/b43/phy_n.h | |
| parent | 90c30335a70e96b8b8493b7deb15e6b30e6d9fce (diff) | |
| parent | 5ffaf8a361b4c9025963959a744f21d8173c7669 (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/b43/phy_n.h')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h index 4572866756f..ae82f0fc209 100644 --- a/drivers/net/wireless/b43/phy_n.h +++ b/drivers/net/wireless/b43/phy_n.h @@ -973,6 +973,12 @@ struct b43_phy_n { bool hang_avoid; bool mute; u16 papd_epsilon_offset[2]; + s32 preamble_override; + u32 bb_mult_save; + + bool gain_boost; + bool elna_gain_config; + bool band5g_pwrgain; u8 mphase_cal_phase_id; u16 mphase_txcal_cmdidx; @@ -985,6 +991,7 @@ struct b43_phy_n { bool txiqlocal_coeffsvalid; struct b43_phy_n_txpwrindex txpwrindex[2]; + u8 txrx_chain; u16 tx_rx_cal_phy_saveregs[11]; u16 tx_rx_cal_radio_saveregs[22]; |