aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2010-11-28 06:59:44 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-02 14:37:01 -0500
commit8c1d5a7a2230a162af709fa118f051e0d18ff427 (patch)
treea5f5027b4f9c893fd967b2d4b3d333cf5e77dc1d /drivers/net/wireless/b43
parent161d540c8ef31e5adbced3248873024476e2c26f (diff)
b43: N-PHY: initialize perical variable, add missing call to CCA reset
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r--drivers/net/wireless/b43/phy_n.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 8690551f087..a721cac4297 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -2212,6 +2212,9 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
2212 2212
2213 b43_nphy_classifier(dev, 7, class); 2213 b43_nphy_classifier(dev, 7, class);
2214 b43_nphy_write_clip_detection(dev, clip_state); 2214 b43_nphy_write_clip_detection(dev, clip_state);
2215 /* Specs don't say about reset here, but it makes wl and b43 dumps
2216 identical, it really seems wl performs this */
2217 b43_nphy_reset_cca(dev);
2215} 2218}
2216 2219
2217/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */ 2220/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */
@@ -3625,6 +3628,7 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)
3625 nphy->gain_boost = true; /* this way we follow wl, assume it is true */ 3628 nphy->gain_boost = true; /* this way we follow wl, assume it is true */
3626 nphy->txrx_chain = 2; /* sth different than 0 and 1 for now */ 3629 nphy->txrx_chain = 2; /* sth different than 0 and 1 for now */
3627 nphy->phyrxchain = 3; /* to avoid b43_nphy_set_rx_core_state like wl */ 3630 nphy->phyrxchain = 3; /* to avoid b43_nphy_set_rx_core_state like wl */
3631 nphy->perical = 2; /* avoid additional rssi cal on init (like wl) */
3628} 3632}
3629 3633
3630static void b43_nphy_op_free(struct b43_wldev *dev) 3634static void b43_nphy_op_free(struct b43_wldev *dev)