---

yaml --- r: 183850 b: refs/heads/master c: ad9716e h: refs/heads/master v: v3
git-mirror · Jan 19, 2010 · 9bd2e55 · 9bd2e55
1 parent 0c9c6ea
commit 9bd2e55
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e53de67449bbcaf5551f54e506a4dff62fc6a49c
+refs/heads/master: ad9716e8e8bc39664a0d41ec94f9bffbf748b45b
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -424,6 +424,20 @@ static void b43_nphy_reset_cca(struct b43_wldev *dev)
 	/* TODO: N PHY Force RF Seq with argument 2 */
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */
+static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)
+{
+	u16 mimocfg = b43_phy_read(dev, B43_NPHY_MIMOCFG);
+
+	mimocfg |= B43_NPHY_MIMOCFG_AUTO;
+	if (preamble == 1)
+		mimocfg |= B43_NPHY_MIMOCFG_GFMIX;
+	else
+		mimocfg &= ~B43_NPHY_MIMOCFG_GFMIX;
+
+	b43_phy_write(dev, B43_NPHY_MIMOCFG, mimocfg);
+}
+
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqEst */
 static void b43_nphy_rx_iq_est(struct b43_wldev *dev, struct nphy_iq_est *est,
 				u16 samps, u8 time, bool wait)
@@ -2180,7 +2194,7 @@ int b43_phy_initn(struct b43_wldev *dev)
 	b43_phy_write(dev, B43_NPHY_PLOAD_CSENSE_EXTLEN, 0x50);
 	b43_phy_write(dev, B43_NPHY_TXRIFS_FRDEL, 0x30);
 
-	/* TODO MIMO-Config */
+	b43_nphy_update_mimo_config(dev, nphy->preamble_override);
 	/* TODO Update TX/RX chain */
 
 	if (phy->rev < 2) {

diff --git a/trunk/drivers/net/wireless/b43/phy_n.h b/trunk/drivers/net/wireless/b43/phy_n.h
@@ -973,6 +973,7 @@ struct b43_phy_n {
 	bool hang_avoid;
 	bool mute;
 	u16 papd_epsilon_offset[2];
+	s32 preamble_override;
 
 	u8 mphase_cal_phase_id;
 	u16 mphase_txcal_cmdidx;