---

yaml --- r: 183695 b: refs/heads/master c: 730dd70 h: refs/heads/master i: 183693: 4facee6 183691: f56a14d 183687: 5a2d0d9 183679: 1670cc7 v: v3
git-mirror · Jan 15, 2010 · 3a2d654 · 3a2d654
1 parent 1362480
commit 3a2d654
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dcd9d911cace479ff5612dab3896c8fceb60773
+refs/heads/master: 730dd70549e0ec755dd55615ba5cfc38a482a947
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -222,12 +222,6 @@ void b43_nphy_radio_turn_off(struct b43_wldev *dev)
 		     ~B43_NPHY_RFCTL_CMD_EN);
 }
 
-#define ntab_upload(dev, offset, data) do { \
-		unsigned int i;						\
-		for (i = 0; i < (offset##_SIZE); i++)			\
-			b43_ntab_write(dev, (offset) + i, (data)[i]);	\
-	} while (0)
-
 /*
  * Upload the N-PHY tables.
  * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables
@@ -2021,11 +2015,11 @@ int b43_phy_initn(struct b43_wldev *dev)
 	b43_nphy_workarounds(dev);
 
 	/* Reset CCA, in init code it differs a little from standard way */
-	/* b43_nphy_bmac_clock_fgc(dev, 1); */
+	b43_nphy_bmac_clock_fgc(dev, 1);
 	tmp = b43_phy_read(dev, B43_NPHY_BBCFG);
 	b43_phy_write(dev, B43_NPHY_BBCFG, tmp | B43_NPHY_BBCFG_RSTCCA);
 	b43_phy_write(dev, B43_NPHY_BBCFG, tmp & ~B43_NPHY_BBCFG_RSTCCA);
-	/* b43_nphy_bmac_clock_fgc(dev, 0); */
+	b43_nphy_bmac_clock_fgc(dev, 0);
 
 	/* TODO N PHY MAC PHY Clock Set with argument 1 */