From 83b8e3bf74770342cfb567e03e507ea9a9ea88ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Mon, 29 Mar 2010 00:53:12 +0200
Subject: [PATCH] --- yaml --- r: 194143 b: refs/heads/master c:
 d817f4e18cf54ae7d662cf2f33e51685e81ad254 h: refs/heads/master i:   194141:
 5a8ff171ab2e6b3a365ef6373c1f61d9e9d91b63   194139:
 d0e7d2b4f45dace832b32f79262fada806982901   194135:
 aab8c059f1e067b122084b5b9eedd5d68911de94   194127:
 5ae4b3e82feb2551c66128cc7c61a4062bc5c89f   194111:
 807b80052fb247b7b894fbccc6d6f66b43f5c02f v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/net/wireless/b43/phy_n.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 22b82a78e493..050f716521b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f01a0229b0343d56b2e084f1472ff3edc1a2090b
+refs/heads/master: d817f4e18cf54ae7d662cf2f33e51685e81ad254
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
index 6fd140ac7f9e..05866675015e 100644
--- a/trunk/drivers/net/wireless/b43/phy_n.c
+++ b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -253,6 +253,16 @@ static void b43_radio_init2055(struct b43_wldev *dev)
 	b43_radio_init2055_post(dev);
 }
 
+/*
+ * Initialize a Broadcom 2056 N-radio
+ * http://bcm-v4.sipsolutions.net/802.11/Radio/2056/Init
+ */
+static void b43_radio_init2056(struct b43_wldev *dev)
+{
+	/* TODO */
+}
+
+
 /*
  * Upload the N-PHY tables.
  * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables
@@ -3473,6 +3483,8 @@ static void b43_nphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)
 static void b43_nphy_op_software_rfkill(struct b43_wldev *dev,
 					bool blocked)
 {
+	struct b43_phy_n *nphy = dev->phy.n;
+
 	if (b43_read32(dev, B43_MMIO_MACCTL) & B43_MACCTL_ENABLED)
 		b43err(dev->wl, "MAC not suspended\n");
 
@@ -3498,8 +3510,8 @@ static void b43_nphy_op_software_rfkill(struct b43_wldev *dev,
 		}
 	} else {
 		if (dev->phy.rev >= 3) {
-			/* TODO: b43_radio_init2056(dev); */
-			/* TODO: PHY Set Channel Spec (dev, radio_chanspec) */
+			b43_radio_init2056(dev);
+			b43_nphy_set_chanspec(dev, nphy->radio_chanspec);
 		} else {
 			b43_radio_init2055(dev);
 		}